commit f960ca95902f8b9f70703dd942c25365e92163cf
author Narayan Kamath <narayan@google.com> Fri Nov 15 09:47:32 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Fri Nov 15 09:47:32 2013 -0800
tree ab34cb40c0e4f13c8ae549f9467c09e834a3e174
parent 0dc74ed485c718ee69ba84ca522dc4e0930feb30
parent 15e00b6ef3092d5fe6c94e328aa6da210c941d1d

am 15e00b6e: am 5d973f8b: Merge "Move tests from tests/api to harmony-tests."

* commit '15e00b6ef3092d5fe6c94e328aa6da210c941d1d':
  Move tests from tests/api to harmony-tests.

expectations/brokentests.txt

diff --git a/expectations/brokentests.txt b/expectations/brokentests.txt
index 43e6ed2..9d7cf49 100644
--- a/expectations/brokentests.txt
+++ b/expectations/brokentests.txt
@@ -855,28 +855,28 @@
   description: "Some tests depend on ICU data, which has changed. Others make assumptions about floating point rounding",
   result: EXEC_FAILED,
   names: [
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_BigDecimalExceptionOrder",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_DateTimeConversion",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionE",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionF",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionG",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatDoubleBigDecimalExceptionOrder",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_GeneralConversionOther",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_LineSeparator",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Percent",
-    "tests.api.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Width"
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_BigDecimalExceptionOrder",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_DateTimeConversion",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionE",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionF",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatConversionG",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_FloatDoubleBigDecimalExceptionOrder",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_GeneralConversionOther",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_LineSeparator",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Percent",
+    "org.apache.harmony.tests.java.util.FormatterTest#test_formatLjava_lang_String$Ljava_lang_Object_Width"
   ]
 },
 {
   description: "(Needs investigation) Some tests make assertions that don't make sense, others use broken port allocation logic.",
   result: EXEC_FAILED,
   names: [
-    "tests.api.java.net.Inet6AddressTest#test_getByNameLjava_lang_String",
-    "tests.api.java.net.InetAddressTest#test_equalsLjava_lang_Object",
-    "tests.api.java.net.InetAddressTest#test_getByNameLjava_lang_String",
-    "tests.api.java.net.InetAddressTest#test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface",
-    "tests.api.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface",
-    "tests.api.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface_IPv4"
+    "org.apache.harmony.tests.java.net.Inet6AddressTest#test_getByNameLjava_lang_String",
+    "org.apache.harmony.tests.java.net.InetAddressTest#test_equalsLjava_lang_Object",
+    "org.apache.harmony.tests.java.net.InetAddressTest#test_getByNameLjava_lang_String",
+    "org.apache.harmony.tests.java.net.InetAddressTest#test_isReachableLjava_net_NetworkInterfaceII_loopbackInterface",
+    "org.apache.harmony.tests.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface",
+    "org.apache.harmony.tests.java.net.MulticastSocketTest#test_joinGroupLjava_net_SocketAddressLjava_net_NetworkInterface_IPv4"
   ]
 }
 ]

expectations/icebox.txt

diff --git a/expectations/icebox.txt b/expectations/icebox.txt
index 09e05e2..daf9af4 100644
--- a/expectations/icebox.txt
+++ b/expectations/icebox.txt
@@ -107,7 +107,7 @@
 {
   description: "a low impact bug, we can't produce tiny random, probable prime big integers",
   result: EXEC_FAILED,
-  name: "tests.api.java.math.BigIntegerTest#test_ConstructorIILjava_util_Random",
+  name: "org.apache.harmony.tests.java.math.BigIntegerTest#test_ConstructorIILjava_util_Random",
   substring: "junit.framework.AssertionFailedError: Random number one is too big"
 },
 {

expectations/knownfailures.txt

diff --git a/expectations/knownfailures.txt b/expectations/knownfailures.txt
index ae17a01..c605f40 100644
--- a/expectations/knownfailures.txt
+++ b/expectations/knownfailures.txt
@@ -277,7 +277,7 @@
   description: "It's not allowed to pass null as parent class loader to a new ClassLoader anymore. Maybe we need
                 to change URLClassLoader to allow this? It's not specified.",
   result: EXEC_FAILED,
-  name: "tests.api.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_LocaleLjava_lang_ClassLoader"
+  name: "org.apache.harmony.tests.java.util.ResourceBundleTest#test_getBundleLjava_lang_StringLjava_util_LocaleLjava_lang_ClassLoader"
 },
 {
   description: "Fails (probably) because no protection domain is set.",
@@ -298,7 +298,7 @@
 {
   description: "Android doesn't support protection domains.",
   result: EXEC_FAILED,
-  name: "tests.api.java.security.PermissionCollectionTest#test_impliesLjava_security_Permission"
+  name: "org.apache.harmony.tests.java.security.PermissionCollectionTest#test_impliesLjava_security_Permission"
 },
 {
   description: "Android doesn't allow null parent.",
@@ -1688,75 +1688,75 @@
 {
   description: "getExceptionTypes() error when throws clause contains an exception and its sublcass",
   bug: 11647146,
-  name: "tests.api.java.lang.reflect.ProxyTest#test_ProxyClass_withParentAndSubInThrowList"
+  name: "org.apache.harmony.tests.java.lang.reflect.ProxyTest#test_ProxyClass_withParentAndSubInThrowList"
 },
 {
   description: "Known failures in dealing with # in file / jar URLs",
   bug: 11664881,
   names: [
-    "tests.api.internal.net.www.protocol.file.FileURLConnectionTest#testGetContentType",
-    "tests.api.internal.net.www.protocol.file.FileURLConnectionTest#testGetInputStream",
-    "tests.api.internal.net.www.protocol.file.FileURLConnectionTest#testHeaderFunctions",
-    "tests.api.java.lang.ClassLoaderTest#test_getResourceAsStream_withSharpChar",
-    "tests.api.java.lang.ClassTest#test_getResourceAsStream_withSharpChar"
+    "org.apache.harmony.tests.internal.net.www.protocol.file.FileURLConnectionTest#testGetContentType",
+    "org.apache.harmony.tests.internal.net.www.protocol.file.FileURLConnectionTest#testGetInputStream",
+    "org.apache.harmony.tests.internal.net.www.protocol.file.FileURLConnectionTest#testHeaderFunctions",
+    "org.apache.harmony.tests.java.lang.ClassLoaderTest#test_getResourceAsStream_withSharpChar",
+    "org.apache.harmony.tests.java.lang.ClassTest#test_getResourceAsStream_withSharpChar"
   ]
 },
 {
   description: "Known failures in InputStreamReaderTest & OutputStreamWriterTest",
   bug: 11665359,
   names: [
-    "tests.api.java.io.InputStreamReaderTest#test_getEncoding",
-    "tests.api.java.io.InputStreamReaderTest#test_read_1",
-    "tests.api.java.io.InputStreamReaderTest#test_read_specialCharset",
-    "tests.api.java.io.OutputStreamWriterTest#test_getEncoding"
+    "org.apache.harmony.tests.java.io.InputStreamReaderTest#test_getEncoding",
+    "org.apache.harmony.tests.java.io.InputStreamReaderTest#test_read_1",
+    "org.apache.harmony.tests.java.io.InputStreamReaderTest#test_read_specialCharset",
+    "org.apache.harmony.tests.java.io.OutputStreamWriterTest#test_getEncoding"
   ]
 },
 {
   description: "Known failures in PipedInputStreamTest & PipedWriterTest",
   bug: 11666814,
   names: [
-    "tests.api.java.io.PipedInputStreamTest#test_receive",
-    "tests.api.java.io.PipedWriterTest#test_flushAfterClose"
+    "org.apache.harmony.tests.java.io.PipedInputStreamTest#test_receive",
+    "org.apache.harmony.tests.java.io.PipedWriterTest#test_flushAfterClose"
   ]
 },
 {
   description: "Known failures in SerializationStressTest",
   bug: 11668227,
   names: [
-    "tests.api.java.io.SerializationStressTest3#test_18_113_writeObject",
-    "tests.api.java.io.SerializationStressTest3#test_18_115_writeObject",
-    "tests.api.java.io.SerializationStressTest4#test_writeObject_Collections_UnmodifiableMap_UnmodifiableEntrySet"
+    "org.apache.harmony.tests.java.io.SerializationStressTest3#test_18_113_writeObject",
+    "org.apache.harmony.tests.java.io.SerializationStressTest3#test_18_115_writeObject",
+    "org.apache.harmony.tests.java.io.SerializationStressTest4#test_writeObject_Collections_UnmodifiableMap_UnmodifiableEntrySet"
   ]
 },
 {
   description: "Known failure in MathTest 1^NAN should be NAN",
   bug: 11669804,
-  name: "tests.api.java.lang.MathTest#test_powDD"
+  name: "org.apache.harmony.tests.java.lang.MathTest#test_powDD"
 },
 {
   description: "Known failures in PropertiesTest: We don't deal with comments in store()",
   bug: 11686302,
   names: [
-    "tests.api.java.util.PropertiesTest#testStore_scenario0",
-    "tests.api.java.util.PropertiesTest#testStore_scenario1",
-    "tests.api.java.util.PropertiesTest#testStore_scenario2",
-    "tests.api.java.util.PropertiesTest#testStore_scenario3",
-    "tests.api.java.util.PropertiesTest#testStore_scenario9",
-    "tests.api.java.util.PropertiesTest#testStore_scenario11"
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario0",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario1",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario2",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario3",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario9",
+    "org.apache.harmony.tests.java.util.PropertiesTest#testStore_scenario11"
   ]
 },
 {
   description: "Known failures in URLTest and URLDecoderTest",
   bug: 11686814,
   names: [
-    "tests.api.java.net.URLTest#test_ConstructorLjava_net_URLLjava_lang_String",
-    "tests.api.java.net.URLTest#test_sameFileLjava_net_URL",
-    "tests.api.java.net.URLDecoderTest#test_decodeLjava_lang_String_Ljava_lang_String"
+    "org.apache.harmony.tests.java.net.URLTest#test_ConstructorLjava_net_URLLjava_lang_String",
+    "org.apache.harmony.tests.java.net.URLTest#test_sameFileLjava_net_URL",
+    "org.apache.harmony.tests.java.net.URLDecoderTest#test_decodeLjava_lang_String_Ljava_lang_String"
   ]
 },
 {
   description: "Known failure in CookieManagerTest",
   bug: 11689102,
-  name: "tests.api.java.net.CookieManagerTest#test_Put_Get_LURI_LMap"
+  name: "org.apache.harmony.tests.java.net.CookieManagerTest#test_Put_Get_LURI_LMap"
 }
 ]

harmony-tests/src/test/java/org/apache/harmony/tests/internal/net/www/protocol/file/FileURLConnectionTest.java

diff --git a/luni/src/test/java/tests/api/internal/net/www/protocol/file/FileURLConnectionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/internal/net/www/protocol/file/FileURLConnectionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/internal/net/www/protocol/file/FileURLConnectionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/internal/net/www/protocol/file/FileURLConnectionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java
index 3d16e74..aea5196 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestCase;
 import tests.support.Support_PlatformFile;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java
index 12cb0d7..9c5bb2d 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedOutputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedOutputStream;
 import java.io.ByteArrayInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java
index f101c73..1da9502 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/io/BufferedReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.luni.tests.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java
index f4e2cdb..d1bb971 100644
--- a/luni/src/test/java/tests/api/java/io/BufferedWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/BufferedWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedWriter;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java
index c10f9c5..4ab972d 100644
--- a/luni/src/test/java/tests/api/java/io/ByteArrayInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java
index cee1df4..9e95de1 100644
--- a/luni/src/test/java/tests/api/java/io/ByteArrayOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ByteArrayOutputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.FileDescriptor;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java
index 71ea6e3..8865332 100644
--- a/luni/src/test/java/tests/api/java/io/CharArrayReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.CharArrayReader;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java
index 407c286..951a1a1 100644
--- a/luni/src/test/java/tests/api/java/io/CharArrayWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharArrayWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.CharArrayReader;
 import java.io.CharArrayWriter;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java
index 2d43ea9..c399793 100644
--- a/luni/src/test/java/tests/api/java/io/CharConversionExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/CharConversionExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.CharConversionException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java
index 458c27f..12542fd 100644
--- a/luni/src/test/java/tests/api/java/io/ComputeSerialVersionUIDTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ComputeSerialVersionUIDTest.java
@@ -1,11 +1,11 @@
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ObjectInputStream;
 
 public class ComputeSerialVersionUIDTest extends junit.framework.TestCase {
 
 
-    private String path = "/serialization/tests/api/java/io/";
+    private String path = "/serialization/org/apache/harmony/tests/java/io/";
 
     public void testComputeSUIDClass() throws Exception {
         ObjectInputStream ois = new ObjectInputStream(getClass()

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ConsoleTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/ConsoleTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java
index 0f2b17f..47e8779 100644
--- a/luni/src/test/java/tests/api/java/io/ConsoleTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ConsoleTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestCase;
 import java.io.ByteArrayInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java
index 8403af7..67a4e5f 100644
--- a/luni/src/test/java/tests/api/java/io/DataInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataInputStreamTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java
index d6c27b9..1f124f1 100644
--- a/luni/src/test/java/tests/api/java/io/DataOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/DataOutputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java
index 80e4636..1610816 100644
--- a/luni/src/test/java/tests/api/java/io/EOFExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/EOFExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.DataInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java
index f994677..b4bb180 100644
--- a/luni/src/test/java/tests/api/java/io/FileDescriptorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileDescriptorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedOutputStream;
 import java.io.File;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java
index 031cd39..2da82f4 100644
--- a/luni/src/test/java/tests/api/java/io/FileInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestCase;
 import tests.support.Support_PlatformFile;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java
index 466aa3d..a1772cd 100644
--- a/luni/src/test/java/tests/api/java/io/FileNotFoundExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileNotFoundExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.FileNotFoundException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java
index 8f3c498..1d13f76 100644
--- a/luni/src/test/java/tests/api/java/io/FileOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileOutputStreamTest.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.File;
 import java.io.FileDescriptor;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/FileReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java
index d2ed6de..bbe20fa 100644
--- a/luni/src/test/java/tests/api/java/io/FileReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedWriter;
 import java.io.File;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/FileTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
index 5660e37..eed9841 100644
--- a/luni/src/test/java/tests/api/java/io/FileTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestCase;
 import org.apache.harmony.testframework.serialization.SerializationTest;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FileWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/FileWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java
index 1fb38dc..f8f0d4f 100644
--- a/luni/src/test/java/tests/api/java/io/FileWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FileWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java
index 14b63dc..600b145 100644
--- a/luni/src/test/java/tests/api/java/io/FilterInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.File;
 import java.io.FilterInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java
index 5a5b6b0..666955d 100644
--- a/luni/src/test/java/tests/api/java/io/FilterOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/FilterOutputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/io/IOErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/IOErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java
index 69f9efd..b95adc9 100644
--- a/luni/src/test/java/tests/api/java/io/IOErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOError;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/IOExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/IOExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java
index 943fc8b..d0b26db 100644
--- a/luni/src/test/java/tests/api/java/io/IOExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/IOExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
index fa9f5b9..79a9f39 100644
--- a/luni/src/test/java/tests/api/java/io/InputStreamReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/InputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/io/InputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java
index 9d478c7..f2543c3 100644
--- a/luni/src/test/java/tests/api/java/io/InputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java
index ae38d0e..5fc3d44 100644
--- a/luni/src/test/java/tests/api/java/io/InterruptedIOExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InterruptedIOExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.InterruptedIOException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java
index de7017a..f0d30f2 100644
--- a/luni/src/test/java/tests/api/java/io/InvalidClassExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/InvalidClassExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.InvalidClassException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java
index 189daef..de345f1 100644
--- a/luni/src/test/java/tests/api/java/io/LineNumberInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberInputStreamTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedInputStream;
 import java.io.ByteArrayInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java
index e90c561..d20b7af 100644
--- a/luni/src/test/java/tests/api/java/io/LineNumberReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/LineNumberReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java
index a34a349..cd62bbc 100644
--- a/luni/src/test/java/tests/api/java/io/NotActiveExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotActiveExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.NotActiveException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java
index a4c90c8..9df51a0 100644
--- a/luni/src/test/java/tests/api/java/io/NotSerializableExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/NotSerializableExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.NotSerializableException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java

diff --git a/luni/src/test/java/tests/api/java/io/ObjectInputStream2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/ObjectInputStream2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
index 6988f27..af5fce5 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectInputStream2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectInputStream2Test.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java

diff --git a/luni/src/test/java/tests/api/java/io/ObjectOutputStream2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/ObjectOutputStream2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java
index 82d82b9..99546c4 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectOutputStream2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStream2Test.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java
index 96d1771..1c98257 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectOutputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
similarity index 93%
rename from luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
index ddaf8a7..3806492 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectStreamClassTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamClassTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestCase;
 import java.io.Externalizable;
@@ -81,7 +81,7 @@
         ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
         assertEquals(
                 "getName returned incorrect name: " + osc.getName(),
-                "tests.api.java.io.ObjectStreamClassTest$DummyClass",
+                "org.apache.harmony.tests.java.io.ObjectStreamClassTest$DummyClass",
                 osc.getName());
     }
 
@@ -117,7 +117,7 @@
         ObjectStreamClass osc = ObjectStreamClass.lookup(DummyClass.class);
         assertEquals(
                 "lookup returned wrong class: " + osc.getName(),
-                "tests.api.java.io.ObjectStreamClassTest$DummyClass",
+                "org.apache.harmony.tests.java.io.ObjectStreamClassTest$DummyClass",
                 osc.getName());
     }
 
@@ -201,17 +201,17 @@
         // java.io.ObjectStreamClass.lookupAny(java.lang.Class)
         ObjectStreamClass osc = ObjectStreamClass.lookupAny(DummyClass.class);
         assertEquals("lookup returned wrong class: " + osc.getName(),
-                "tests.api.java.io.ObjectStreamClassTest$DummyClass", osc
+                "org.apache.harmony.tests.java.io.ObjectStreamClassTest$DummyClass", osc
                 .getName());
 
         osc = ObjectStreamClass.lookupAny(NonSerialzableClass.class);
         assertEquals("lookup returned wrong class: " + osc.getName(),
-                "tests.api.java.io.ObjectStreamClassTest$NonSerialzableClass",
+                "org.apache.harmony.tests.java.io.ObjectStreamClassTest$NonSerialzableClass",
                 osc.getName());
 
         osc = ObjectStreamClass.lookupAny(ExternalizableClass.class);
         assertEquals("lookup returned wrong class: " + osc.getName(),
-                "tests.api.java.io.ObjectStreamClassTest$ExternalizableClass",
+                "org.apache.harmony.tests.java.io.ObjectStreamClassTest$ExternalizableClass",
                 osc.getName());
 
         osc = ObjectStreamClass.lookup(NonSerialzableClass.class);

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamConstantsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/io/ObjectStreamConstantsTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java
index 5fd09f6..7fbaa93 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectStreamConstantsTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamConstantsTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ObjectStreamConstants;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java
index 2b225b4..8dd12a4 100644
--- a/luni/src/test/java/tests/api/java/io/ObjectStreamFieldTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ObjectStreamFieldTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java

diff --git a/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java
index cb7b312..2341ee9 100644
--- a/luni/src/test/java/tests/api/java/io/OpenRandomFileTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OpenRandomFileTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.File;
 import java.io.FileOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/OutputStreamTesterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/OutputStreamTesterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java
index f9e1561..0b5dde1 100644
--- a/luni/src/test/java/tests/api/java/io/OutputStreamTesterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamTesterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestSuite;
 import org.apache.harmony.testframework.SinkTester;
@@ -48,7 +48,8 @@
  */
 public class OutputStreamTesterTest {
 
-    public static junit.framework.Test suite() {
+    // TODO: Rewrite this test so that id doesn't need a suite().
+    private static junit.framework.Test suite() {
         TestSuite suite = new TestSuite();
 
         // sink tests

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java
index 16244ec..dece473 100644
--- a/luni/src/test/java/tests/api/java/io/OutputStreamWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/OutputStreamWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java
index e787c67..9cf8054 100644
--- a/luni/src/test/java/tests/api/java/io/PipedInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedInputStreamTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.PipedInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java
index bf2f703..183606e 100644
--- a/luni/src/test/java/tests/api/java/io/PipedOutputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedOutputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.PipedInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PipedReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PipedReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java
index fb42069..6802540 100644
--- a/luni/src/test/java/tests/api/java/io/PipedReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.PipedReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PipedWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PipedWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java
index eb66e86..99827a1 100644
--- a/luni/src/test/java/tests/api/java/io/PipedWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PipedWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.PipedReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PrintStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PrintStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java
index 1b74059..19a63af 100644
--- a/luni/src/test/java/tests/api/java/io/PrintStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PrintWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PrintWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java
index 8866212..9c60406 100644
--- a/luni/src/test/java/tests/api/java/io/PrintWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PrintWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java
index 683d6f7..8c56934 100644
--- a/luni/src/test/java/tests/api/java/io/PushbackInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java
index 973c029..d49ee53 100644
--- a/luni/src/test/java/tests/api/java/io/PushbackReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/PushbackReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.CharArrayReader;
 import java.io.FilterReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java

diff --git a/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java
index 4b37616..f6784fb 100644
--- a/luni/src/test/java/tests/api/java/io/RandomAccessFileTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/RandomAccessFileTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.EOFException;
 import java.io.File;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/ReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/ReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java
index 34f2599..f2b1439 100644
--- a/luni/src/test/java/tests/api/java/io/ReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/ReaderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.Reader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java
index 8ee97f3..e4608db 100644
--- a/luni/src/test/java/tests/api/java/io/SequenceInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SequenceInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java

diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/SerializationStressTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java
index ef0e2ff..c6371ea 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java

diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
index 3b1f210..df5f792 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest1.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest1.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.NotSerializableException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java

diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java
index c3a388d..359050e 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest2.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest2.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java

diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java
index 0d37c84..8087761 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest3.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest3.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java

diff --git a/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java
index 1fcfe57..1e569e8 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationStressTest4.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationStressTest4.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import tests.support.Support_Proxy_I1;
 import java.io.File;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java

diff --git a/luni/src/test/java/tests/api/java/io/SerializationTestClass.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/SerializationTestClass.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java
index 32c4d0b..d5770e7 100644
--- a/luni/src/test/java/tests/api/java/io/SerializationTestClass.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SerializationTestClass.java
@@ -1,4 +1,4 @@
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 public class SerializationTestClass implements java.io.Serializable {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java
index 20fce7f..e9e6a70 100644
--- a/luni/src/test/java/tests/api/java/io/StreamCorruptedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamCorruptedExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.ObjectInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java

diff --git a/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java
index 472fd5a..f4d4401 100644
--- a/luni/src/test/java/tests/api/java/io/StreamTokenizerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StreamTokenizerTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java

diff --git a/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java
index 9adce09..8ca4ca5 100644
--- a/luni/src/test/java/tests/api/java/io/StringBufferInputStreamTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringBufferInputStreamTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.StringBufferInputStream;
 import java.io.UnsupportedEncodingException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java

diff --git a/luni/src/test/java/tests/api/java/io/StringReaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/StringReaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java
index 2e2f4cf..4d44d98 100644
--- a/luni/src/test/java/tests/api/java/io/StringReaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringReaderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.StringReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/StringWriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/StringWriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java
index dcb9a25..c3db539 100644
--- a/luni/src/test/java/tests/api/java/io/StringWriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/StringWriterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.StringWriter;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java
index 481d3d3..409561a 100644
--- a/luni/src/test/java/tests/api/java/io/SyncFailedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/SyncFailedExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.File;
 import java.io.FileDescriptor;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java
index ecaa5bc..cf5aa82 100644
--- a/luni/src/test/java/tests/api/java/io/UTFDataFormatExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UTFDataFormatExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java
index 44c2fd5..82b2dfb 100644
--- a/luni/src/test/java/tests/api/java/io/UnsupportedEncodingExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/UnsupportedEncodingExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.ByteArrayOutputStream;
 import java.io.OutputStreamWriter;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java
index 1d270f6..1c3f1e3 100644
--- a/luni/src/test/java/tests/api/java/io/WriteAbortedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriteAbortedExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.WriteAbortedException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/WriterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/io/WriterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java
index b161030..d4c33ea 100644
--- a/luni/src/test/java/tests/api/java/io/WriterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import java.io.IOException;
 import java.io.Writer;

harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java

diff --git a/luni/src/test/java/tests/api/java/io/WriterTesterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/io/WriterTesterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java
index e087fac..0995638 100644
--- a/luni/src/test/java/tests/api/java/io/WriterTesterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/io/WriterTesterTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.io;
+package org.apache.harmony.tests.java.io;
 
 import junit.framework.TestSuite;
 import org.apache.harmony.testframework.CharSinkTester;
@@ -46,7 +46,8 @@
  */
 public class WriterTesterTest {
 
-    public static junit.framework.Test suite() {
+    // TODO: Rewrite this test so that id doesn't need a suite().
+    private static junit.framework.Test suite() {
         TestSuite suite = new TestSuite();
 
         // sink tests

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/AbstractMethodErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/AbstractMethodErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java
index c30e68f..596792e 100644
--- a/luni/src/test/java/tests/api/java/lang/AbstractMethodErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ArithmeticExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ArithmeticExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java
index 6ecf6ac..77e0671 100644
--- a/luni/src/test/java/tests/api/java/lang/ArithmeticExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArithmeticExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
index 90ba03e..3561dd9 100644
--- a/luni/src/test/java/tests/api/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayIndexOutOfBoundsExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ArrayStoreExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ArrayStoreExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java
index fc323d4..0379769 100644
--- a/luni/src/test/java/tests/api/java/lang/ArrayStoreExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ArrayStoreExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java
index c0c968c..8b6c80d 100644
--- a/luni/src/test/java/tests/api/java/lang/AssertionErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/AssertionErrorTest.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/BooleanTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/BooleanTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java
index 6bc6e83..a6dda7a 100644
--- a/luni/src/test/java/tests/api/java/lang/BooleanTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/BooleanTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ByteTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ByteTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java
index ed1bee7..bbff653 100644
--- a/luni/src/test/java/tests/api/java/lang/ByteTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ByteTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/CharacterImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/CharacterImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java
index 2963d41..4db5b82 100644
--- a/luni/src/test/java/tests/api/java/lang/CharacterImplTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterImplTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/CharacterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/CharacterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
index 776ebf07..a8bbe26 100644
--- a/luni/src/test/java/tests/api/java/lang/CharacterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CharacterTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.util.Arrays;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/Character_SubsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/Character_SubsetTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java
index 7a271da..41408ec 100644
--- a/luni/src/test/java/tests/api/java/lang/Character_SubsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_SubsetTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/Character_UnicodeBlockTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/Character_UnicodeBlockTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
index bc40b2c..7a85a3c 100644
--- a/luni/src/test/java/tests/api/java/lang/Character_UnicodeBlockTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Character_UnicodeBlockTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ClassCastExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ClassCastExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java
index 4ed7c9a..2863bd6 100644
--- a/luni/src/test/java/tests/api/java/lang/ClassCastExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCastExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ClassCircularityErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ClassCircularityErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java
index 91499b6..54c5c4d 100644
--- a/luni/src/test/java/tests/api/java/lang/ClassCircularityErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassCircularityErrorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ClassFormatErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ClassFormatErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java
index d8b3c15..f811c9a 100644
--- a/luni/src/test/java/tests/api/java/lang/ClassFormatErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassFormatErrorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java
index ff42cf0..1dba613 100644
--- a/luni/src/test/java/tests/api/java/lang/ClassLoaderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassLoaderTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ClassNotFoundExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/ClassNotFoundExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java
index 9a56281..e199aa2 100644
--- a/luni/src/test/java/tests/api/java/lang/ClassNotFoundExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassNotFoundExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.IOException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ClassTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ClassTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java
index 0c57dde..4d540c4 100644
--- a/luni/src/test/java/tests/api/java/lang/ClassTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ClassTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.FileInputStream;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/CloneNotSupportedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/CloneNotSupportedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java
index ec6a9fa..0af1dbc 100644
--- a/luni/src/test/java/tests/api/java/lang/CloneNotSupportedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CloneNotSupportedExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/CompilerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/CompilerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java
index 027c99b..8584ce4 100644
--- a/luni/src/test/java/tests/api/java/lang/CompilerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/CompilerTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/DoubleTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/DoubleTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java
index b61d345..79d81e8 100644
--- a/luni/src/test/java/tests/api/java/lang/DoubleTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/DoubleTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.util.Locale;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/EnumConstantNotPresentExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/EnumConstantNotPresentExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java
index 86a589e..e1d8085 100644
--- a/luni/src/test/java/tests/api/java/lang/EnumConstantNotPresentExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumConstantNotPresentExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/EnumTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/EnumTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java
index a044afe..558929d 100644
--- a/luni/src/test/java/tests/api/java/lang/EnumTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/EnumTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.util.HashMap;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java
index ff44056..f11cc64 100644
--- a/luni/src/test/java/tests/api/java/lang/ErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java
index 4fa6e53..b2b034e 100644
--- a/luni/src/test/java/tests/api/java/lang/ExceptionInInitializerErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionInInitializerErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class ExceptionInInitializerErrorTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/ExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java
index e66bb97..1a0f1e4 100644
--- a/luni/src/test/java/tests/api/java/lang/ExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/FloatTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/FloatTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java
index d703356..db61f1c 100644
--- a/luni/src/test/java/tests/api/java/lang/FloatTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/FloatTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IllegalAccessErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/IllegalAccessErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java
index 94f912a..052bca2 100644
--- a/luni/src/test/java/tests/api/java/lang/IllegalAccessErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IllegalAccessExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/IllegalAccessExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java
index 61d6054..eb3b021 100644
--- a/luni/src/test/java/tests/api/java/lang/IllegalAccessExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalAccessExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java
index 6003c9e..c126f86 100644
--- a/luni/src/test/java/tests/api/java/lang/IllegalArgumentExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IllegalMonitorStateExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/IllegalMonitorStateExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java
index 994e591..065b466 100644
--- a/luni/src/test/java/tests/api/java/lang/IllegalMonitorStateExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalMonitorStateExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java
index 02100c0..e02ae18 100644
--- a/luni/src/test/java/tests/api/java/lang/IllegalStateExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IllegalThreadStateExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/IllegalThreadStateExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java
index 4497471..c1c3763 100644
--- a/luni/src/test/java/tests/api/java/lang/IllegalThreadStateExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IllegalThreadStateExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IncompatibleClassChangeErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/IncompatibleClassChangeErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java
index 5bd8789..a8ef32f 100644
--- a/luni/src/test/java/tests/api/java/lang/IncompatibleClassChangeErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IncompatibleClassChangeErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IndexOutOfBoundsExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/IndexOutOfBoundsExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java
index 3414838..7093d4e 100644
--- a/luni/src/test/java/tests/api/java/lang/IndexOutOfBoundsExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IndexOutOfBoundsExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java
index 2ea8dea..d693acd 100644
--- a/luni/src/test/java/tests/api/java/lang/InheritableThreadLocalTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InheritableThreadLocalTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/InstantiationErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/InstantiationErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java
index 8655dad..a069dba 100644
--- a/luni/src/test/java/tests/api/java/lang/InstantiationErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/InstantiationExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/InstantiationExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java
index 1be39ab..757b209 100644
--- a/luni/src/test/java/tests/api/java/lang/InstantiationExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InstantiationExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/IntegerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/IntegerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java
index f80107f..3c7faa3 100644
--- a/luni/src/test/java/tests/api/java/lang/IntegerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/IntegerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.util.Properties;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/InternalErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/InternalErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java
index fff163a..d2ea2de 100644
--- a/luni/src/test/java/tests/api/java/lang/InternalErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InternalErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/InterruptedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/InterruptedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java
index 47066b7..ecaac75 100644
--- a/luni/src/test/java/tests/api/java/lang/InterruptedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/InterruptedExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java
index efd27f5..33ecc16 100644
--- a/luni/src/test/java/tests/api/java/lang/LinkageErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LinkageErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/LongTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/LongTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java
index 2a1d082..9da75cf 100644
--- a/luni/src/test/java/tests/api/java/lang/LongTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/LongTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.util.Properties;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/MathTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/MathTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java
index 1920080..cd38545 100644
--- a/luni/src/test/java/tests/api/java/lang/MathTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MathTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class MathTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java

diff --git a/luni/src/test/java/tests/api/java/lang/MockEnum.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/MockEnum.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java
index ed6c69b..94260c4 100644
--- a/luni/src/test/java/tests/api/java/lang/MockEnum.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.Serializable;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java

diff --git a/luni/src/test/java/tests/api/java/lang/MockEnum2.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/MockEnum2.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java
index 229d106..1dc5341 100644
--- a/luni/src/test/java/tests/api/java/lang/MockEnum2.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/MockEnum2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.Serializable;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NegativeArraySizeExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NegativeArraySizeExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java
index 3c5f124..1717f3a 100644
--- a/luni/src/test/java/tests/api/java/lang/NegativeArraySizeExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NegativeArraySizeExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java
index 98d66f2..9421a73 100644
--- a/luni/src/test/java/tests/api/java/lang/NoClassDefFoundErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoClassDefFoundErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java
index 21d4ff1..e405599 100644
--- a/luni/src/test/java/tests/api/java/lang/NoSuchFieldErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NoSuchFieldExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NoSuchFieldExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java
index 4d52601..5562669 100644
--- a/luni/src/test/java/tests/api/java/lang/NoSuchFieldExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchFieldExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java
index e47349a..1367e03 100644
--- a/luni/src/test/java/tests/api/java/lang/NoSuchMethodErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NoSuchMethodExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NoSuchMethodExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java
index e500909..7bd9e0a 100644
--- a/luni/src/test/java/tests/api/java/lang/NoSuchMethodExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NoSuchMethodExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NullPointerExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NullPointerExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java
index 7a0fb82..9c4a72b 100644
--- a/luni/src/test/java/tests/api/java/lang/NullPointerExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NullPointerExceptionTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NumberFormatExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/NumberFormatExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java
index 329969b..614c51b 100644
--- a/luni/src/test/java/tests/api/java/lang/NumberFormatExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberFormatExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/NumberTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/NumberTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java
index 7ecdda4..809a31a 100644
--- a/luni/src/test/java/tests/api/java/lang/NumberTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/NumberTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class NumberTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ObjectTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ObjectTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java
index e3d0b19..9dca8e9 100644
--- a/luni/src/test/java/tests/api/java/lang/ObjectTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ObjectTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class ObjectTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/OutOfMemoryErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/OutOfMemoryErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java
index 3eb7562e..b962455 100644
--- a/luni/src/test/java/tests/api/java/lang/OutOfMemoryErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/OutOfMemoryErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class OutOfMemoryErrorTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java

diff --git a/luni/src/test/java/tests/api/java/lang/Process2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/Process2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java
index 5d18d61..649488c 100644
--- a/luni/src/test/java/tests/api/java/lang/Process2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/Process2Test.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import dalvik.annotation.AndroidOnly;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ProcessBuilderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ProcessBuilderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java
index 74e51f4..87cf88c 100644
--- a/luni/src/test/java/tests/api/java/lang/ProcessBuilderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessBuilderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 import java.io.File;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
index 99e1df3..3930b59 100644
--- a/luni/src/test/java/tests/api/java/lang/ProcessManagerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessManagerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import dalvik.annotation.BrokenTest;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ProcessTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ProcessTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
index 2a8e0bd..b87105b 100644
--- a/luni/src/test/java/tests/api/java/lang/ProcessTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ProcessTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.File;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java
index 9d073e3..748118a 100644
--- a/luni/src/test/java/tests/api/java/lang/RuntimeExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/RuntimeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/RuntimeTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java
index 5a75c73..08a4fa9 100644
--- a/luni/src/test/java/tests/api/java/lang/RuntimeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/RuntimeTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.IOException;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/SecurityExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/SecurityExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java
index fb63ef8..a0d1cee 100644
--- a/luni/src/test/java/tests/api/java/lang/SecurityExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SecurityExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ShortTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ShortTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java
index 8cbe385..bf747e7 100644
--- a/luni/src/test/java/tests/api/java/lang/ShortTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ShortTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/StackOverflowErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/StackOverflowErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java
index 1e81ab6..b3f6f82 100644
--- a/luni/src/test/java/tests/api/java/lang/StackOverflowErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StackOverflowErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/StrictMathTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/StrictMathTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java
index 8141b2c..cce8935 100644
--- a/luni/src/test/java/tests/api/java/lang/StrictMathTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StrictMathTest.java
@@ -15,17 +15,17 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
-import static tests.api.java.lang.MathTest.COPYSIGN_DD_CASES;
-import static tests.api.java.lang.MathTest.COPYSIGN_FF_CASES;
-import static tests.api.java.lang.MathTest.GETEXPONENT_D_CASES;
-import static tests.api.java.lang.MathTest.GETEXPONENT_D_RESULTS;
-import static tests.api.java.lang.MathTest.GETEXPONENT_F_CASES;
-import static tests.api.java.lang.MathTest.GETEXPONENT_F_RESULTS;
-import static tests.api.java.lang.MathTest.NEXTAFTER_DD_START_CASES;
-import static tests.api.java.lang.MathTest.NEXTAFTER_DD_FD_DIRECTION_CASES;
-import static tests.api.java.lang.MathTest.NEXTAFTER_FD_START_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.COPYSIGN_DD_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.COPYSIGN_FF_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_D_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_D_RESULTS;
+import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_F_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.GETEXPONENT_F_RESULTS;
+import static org.apache.harmony.tests.java.lang.MathTest.NEXTAFTER_DD_START_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.NEXTAFTER_DD_FD_DIRECTION_CASES;
+import static org.apache.harmony.tests.java.lang.MathTest.NEXTAFTER_FD_START_CASES;
 
 public class StrictMathTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java

diff --git a/luni/src/test/java/tests/api/java/lang/String2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/String2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java
index cb13954..eecc601 100644
--- a/luni/src/test/java/tests/api/java/lang/String2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/String2Test.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.UnsupportedEncodingException;
 import java.util.Locale;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java

diff --git a/luni/src/test/java/tests/api/java/lang/StringBuffer2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/StringBuffer2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java
index 1240ba8..7e8144b 100644
--- a/luni/src/test/java/tests/api/java/lang/StringBuffer2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuffer2Test.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class StringBuffer2Test extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/StringBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/StringBufferTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java
index 0cd8f63..112e005 100644
--- a/luni/src/test/java/tests/api/java/lang/StringBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.Serializable;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/StringBuilderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/StringBuilderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java
index b634ddf..febdfc4 100644
--- a/luni/src/test/java/tests/api/java/lang/StringBuilderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringBuilderTest.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.Serializable;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/StringIndexOutOfBoundsExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/StringIndexOutOfBoundsExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java
index 1c26c7d..6bdaa3a 100644
--- a/luni/src/test/java/tests/api/java/lang/StringIndexOutOfBoundsExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringIndexOutOfBoundsExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/StringTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/StringTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
index 1cd92b1..1b3659d 100644
--- a/luni/src/test/java/tests/api/java/lang/StringTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/StringTest.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.UnsupportedEncodingException;
 import java.lang.reflect.Constructor;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/SystemTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/SystemTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java
index cb0d564..05a02c3 100644
--- a/luni/src/test/java/tests/api/java/lang/SystemTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/SystemTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java
similarity index 95%
rename from luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java
index 0c7fff3..1d21dd3 100644
--- a/luni/src/test/java/tests/api/java/lang/ThreadDeathTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadDeathTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 public class ThreadDeathTest extends junit.framework.TestCase {
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java
index a3c9761..dbf2e22 100644
--- a/luni/src/test/java/tests/api/java/lang/ThreadGroupTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadGroupTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.util.Vector;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java
index a0902d8..400ff01 100644
--- a/luni/src/test/java/tests/api/java/lang/ThreadLocalTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadLocalTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ThreadTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ThreadTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java
index 67ab645..956e1a4 100644
--- a/luni/src/test/java/tests/api/java/lang/ThreadTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThreadTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Map;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ThrowableTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ThrowableTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java
index 0a7f02d..dbe656f 100644
--- a/luni/src/test/java/tests/api/java/lang/ThrowableTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ThrowableTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import java.io.ByteArrayOutputStream;
 import java.io.PrintStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/TypeNotPresentExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/TypeNotPresentExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java
index 4b93ab6..3f14e34 100644
--- a/luni/src/test/java/tests/api/java/lang/TypeNotPresentExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/TypeNotPresentExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java
index b6e3406..8ec96a4 100644
--- a/luni/src/test/java/tests/api/java/lang/UnknownErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnknownErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java
index c3e2c9b..d6e06db 100644
--- a/luni/src/test/java/tests/api/java/lang/UnsatisfiedLinkErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsatisfiedLinkErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/UnsupportedClassVersionErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/UnsupportedClassVersionErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java
index 1b606ba..dcf09b8 100644
--- a/luni/src/test/java/tests/api/java/lang/UnsupportedClassVersionErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedClassVersionErrorTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java
index 6d52e7f..73cf5e6 100644
--- a/luni/src/test/java/tests/api/java/lang/UnsupportedOperationExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java
index 9de5e19..874ac57 100644
--- a/luni/src/test/java/tests/api/java/lang/VerifyErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VerifyErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java
index a49e481..60ed446 100644
--- a/luni/src/test/java/tests/api/java/lang/VirtualMachineErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/VirtualMachineErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang;
+package org.apache.harmony.tests.java.lang;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java
index 6470579..5a80fde 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/PhantomReferenceTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/PhantomReferenceTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.ref;
+package org.apache.harmony.tests.java.lang.ref;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java
index cad61b3..ba28541 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/ReferenceQueueTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceQueueTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.ref;
+package org.apache.harmony.tests.java.lang.ref;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java
index 7461b47..031502d 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/ReferenceTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/ReferenceTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.lang.ref;
+package org.apache.harmony.tests.java.lang.ref;
 
 import java.lang.ref.PhantomReference;
 import java.lang.ref.Reference;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java
index 197d829..cfc5d0d 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/SoftReferenceTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/SoftReferenceTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.lang.ref;
+package org.apache.harmony.tests.java.lang.ref;
 
 import dalvik.annotation.SideEffect;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java
index 2bddc1b..c881248 100644
--- a/luni/src/test/java/tests/api/java/lang/ref/WeakReferenceTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/ref/WeakReferenceTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.ref;
+package org.apache.harmony.tests.java.lang.ref;
 
 import java.lang.ref.ReferenceQueue;
 import java.lang.ref.WeakReference;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java
index 41c9798..60432d7 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/AccessibleObjectTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/AccessibleObjectTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java
index d9e05fb..98dd034 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ArrayTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ArrayTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Array;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java
index 7949a30..130aa72 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/BoundedGenericMethodsTests.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/BoundedGenericMethodsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.Type;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java
index 932315c..ec133aa 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ConstructorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ConstructorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -26,7 +26,6 @@
 import java.lang.reflect.Modifier;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Set;
 
@@ -165,13 +164,13 @@
                 .getConstructor(Object.class, Object.class);
         assertEquals(
                 "Wrong generic string returned",
-                "public tests.api.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper(T,S)",
+                "public org.apache.harmony.tests.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper(T,S)",
                 genericCtor.toGenericString());
         Constructor<GenericConstructorTestHelper> ctor = GenericConstructorTestHelper.class
                 .getConstructor();
         assertEquals(
                 "Wrong generic string returned",
-                "public tests.api.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper() throws E",
+                "public org.apache.harmony.tests.java.lang.reflect.ConstructorTest$GenericConstructorTestHelper() throws E",
                 ctor.toGenericString());
     }
 
@@ -265,7 +264,7 @@
                     ctor
                             .getName()
                             .equals(
-                                    "tests.api.java.lang.reflect.ConstructorTest$ConstructorTestHelper"));
+                                    "org.apache.harmony.tests.java.lang.reflect.ConstructorTest$ConstructorTestHelper"));
         } catch (Exception e) {
             fail("Exception obtaining contructor : " + e.getMessage());
         }
@@ -405,7 +404,7 @@
                 ctor
                         .toString()
                         .equals(
-                                "public tests.api.java.lang.reflect.ConstructorTest$ConstructorTestHelper(java.lang.Object)"));
+                                "public org.apache.harmony.tests.java.lang.reflect.ConstructorTest$ConstructorTestHelper(java.lang.Object)"));
     }
 
     public void test_getConstructor() throws Exception {

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java
index 27efb99..d5ce8c2 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/FieldTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/FieldTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import tests.support.Support_Field;
 
@@ -1523,7 +1523,7 @@
             fail("Exception getting field : " + e.getMessage());
         }
         assertEquals("Field returned incorrect string",
-                "private static final int tests.api.java.lang.reflect.FieldTest$TestField.x",
+                "private static final int org.apache.harmony.tests.java.lang.reflect.FieldTest$TestField.x",
                         f.toString());
     }
 
@@ -1593,20 +1593,20 @@
     public void test_toGenericString() throws Exception {
         Field field = GenericField.class.getDeclaredField("field");
         assertEquals("Wrong generic string returned",
-                "S tests.api.java.lang.reflect.FieldTest$GenericField.field",
+                "S org.apache.harmony.tests.java.lang.reflect.FieldTest$GenericField.field",
                 field.toGenericString());
 
         Field boundedField = GenericField.class
                 .getDeclaredField("boundedField");
         assertEquals(
                 "Wrong generic string returned",
-                "T tests.api.java.lang.reflect.FieldTest$GenericField.boundedField",
+                "T org.apache.harmony.tests.java.lang.reflect.FieldTest$GenericField.boundedField",
                 boundedField.toGenericString());
 
         Field ordinary = GenericField.class.getDeclaredField("intField");
         assertEquals(
                 "Wrong generic string returned",
-                "int tests.api.java.lang.reflect.FieldTest$GenericField.intField",
+                "int org.apache.harmony.tests.java.lang.reflect.FieldTest$GenericField.intField",
                 ordinary.toGenericString());
     }
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java
index e48e584..4888fd2 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericArrayTypeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericArrayTypeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.GenericArrayType;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java
index 0bfc188..a209b21 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericMethodsTests.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericMethodsTests.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 
 import java.lang.reflect.Method;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java
index 095bb72..c08fef4 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericReflectionTestsBase.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericReflectionTestsBase.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Method;
 import java.lang.reflect.TypeVariable;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java
similarity index 93%
rename from luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java
index 954073c..9cd4947 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/GenericSignatureFormatErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/GenericSignatureFormatErrorTest.java
@@ -1,4 +1,4 @@
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import dalvik.annotation.AndroidOnly;
 import dalvik.annotation.SideEffect;
@@ -27,7 +27,7 @@
         // System.out.println("GenericSignatureFormatErrorTest:"
         //         +tf.getAbsolutePath()+", canRead: "+tf.canRead()
         //         +", canWrite: "+tf.canWrite());
-        InputStream is = this.getClass().getResourceAsStream("dex1.bytes");
+        InputStream is = this.getClass().getResourceAsStream("/resources/dex1.bytes");
         assertNotNull(is);
     }
 
@@ -58,7 +58,7 @@
         // System.out.println("GenericSignatureFormatErrorTest:" +
         //         tf.getAbsolutePath() + ", canRead: " + tf.canRead() +
         //         ", canWrite: "+tf.canWrite());
-        InputStream is = this.getClass().getResourceAsStream("dex1.bytes");
+        InputStream is = this.getClass().getResourceAsStream("/resources/dex1.bytes");
         assertNotNull(is);
         OutputStream fos = new FileOutputStream(tf);
         copy(is, fos);

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java
index 5e699a9..3911447 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/InvocationTargetExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/InvocationTargetExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.io.ByteArrayOutputStream;
 import java.io.CharArrayWriter;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
similarity index 95%
rename from luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
index 91342dc..04266d5 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.MalformedParameterizedTypeException;
 import junit.framework.TestCase;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
similarity index 93%
rename from luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
index f86403d..79ce85e 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MalformedParameterizedTypeExceptionTests.java
@@ -1,4 +1,4 @@
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.MalformedParameterizedTypeException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java
index e8288d6..9f4f69e 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/MethodTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/MethodTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.annotation.Annotation;
 import java.lang.annotation.ElementType;
@@ -183,7 +183,7 @@
 
     static class GenericString<T> {
       public static final String GENERIC =
-      "T tests.api.java.lang.reflect.MethodTest$GenericString.genericString(T)";
+      "T org.apache.harmony.tests.java.lang.reflect.MethodTest$GenericString.genericString(T)";
         T genericString(T t) {
             return null;
         }
@@ -862,7 +862,7 @@
                 mth
                         .toString()
                         .equals(
-                                "public static final void tests.api.java.lang.reflect.MethodTest$TestMethod.printTest(int,short,java.lang.String,boolean,java.lang.Object,long,byte,char,double,float)"));
+                                "public static final void org.apache.harmony.tests.java.lang.reflect.MethodTest$TestMethod.printTest(int,short,java.lang.String,boolean,java.lang.Object,long,byte,char,double,float)"));
     }
 
     /**

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java
index 6e844f6..71c207f 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ModifierTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ModifierTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Modifier;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java
index fcb9042..3b2614e 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ParameterizedTypeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ParameterizedTypeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java
index 5e5cc73..86383bd 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/ProxyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/ProxyTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import tests.support.Support_Proxy_I1;
 import tests.support.Support_Proxy_I2;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java
index cc22852..d1c7ea9 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/TypeVariableTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/TypeVariableTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.io.Serializable;
 import java.lang.reflect.Constructor;

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java
index b5ad350..9f3679e 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTest.java
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import java.lang.reflect.UndeclaredThrowableException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java
index 8fd2ff3..2112ed7 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/UndeclaredThrowableExceptionTests.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/UndeclaredThrowableExceptionTests.java
@@ -1,4 +1,4 @@
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 import junit.framework.TestCase;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java

diff --git a/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java
index 9f8baeb..e29fd47 100644
--- a/luni/src/test/java/tests/api/java/lang/reflect/WildcardTypeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/lang/reflect/WildcardTypeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.lang.reflect;
+package org.apache.harmony.tests.java.lang.reflect;
 
 
 import java.lang.reflect.Method;

harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java

diff --git a/luni/src/test/java/tests/api/java/math/MathContextTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/math/MathContextTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java
index 9e04342..d9942d3 100644
--- a/luni/src/test/java/tests/api/java/math/MathContextTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/MathContextTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.math;
+package org.apache.harmony.tests.java.math;
 
 import java.math.BigDecimal;
 import java.math.MathContext;

harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java

diff --git a/luni/src/test/java/tests/api/java/math/OldBigIntegerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/math/OldBigIntegerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java
index 167ebe8..7d1f1b4 100644
--- a/luni/src/test/java/tests/api/java/math/OldBigIntegerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/OldBigIntegerTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.math;
+package org.apache.harmony.tests.java.math;
 
 import java.math.BigInteger;
 import java.util.Random;

harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java

diff --git a/luni/src/test/java/tests/api/java/math/RoundingModeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/math/RoundingModeTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java
index 50a77df..4004ca3 100644
--- a/luni/src/test/java/tests/api/java/math/RoundingModeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/RoundingModeTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.math;
+package org.apache.harmony.tests.java.math;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java

diff --git a/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java
index 3c5f92b..a0bd40f 100644
--- a/luni/src/test/java/tests/api/java/net/AuthenticatorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/AuthenticatorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/BindExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/BindExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java
index e1eb401..799211e 100644
--- a/luni/src/test/java/tests/api/java/net/BindExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/BindExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.BindException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java
index 12d37e3..3c69890 100644
--- a/luni/src/test/java/tests/api/java/net/ConnectExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ConnectExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.ConnectException;
 import java.net.InetAddress;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java

diff --git a/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java
index 9f1f4fe..3cefc85 100644
--- a/luni/src/test/java/tests/api/java/net/CookieHandlerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieHandlerTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.net.CookieHandler;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java

diff --git a/luni/src/test/java/tests/api/java/net/CookieManagerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/CookieManagerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java
index bbf699c..c96a407 100644
--- a/luni/src/test/java/tests/api/java/net/CookieManagerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieManagerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import junit.framework.TestCase;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java

diff --git a/luni/src/test/java/tests/api/java/net/CookiePolicyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/CookiePolicyTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java
index b88d356..61eff1e 100644
--- a/luni/src/test/java/tests/api/java/net/CookiePolicyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookiePolicyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.CookiePolicy;
 import java.net.HttpCookie;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java

diff --git a/luni/src/test/java/tests/api/java/net/CookieStoreTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/CookieStoreTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java
index 13e0a0a..d437802 100644
--- a/luni/src/test/java/tests/api/java/net/CookieStoreTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/CookieStoreTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import junit.framework.TestCase;
 import java.net.CookieManager;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java

diff --git a/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java
index e6ced7e..2730b85 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramPacketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramPacketTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.net.DatagramPacket;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java

diff --git a/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java
index 57cafbf..e94a963 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramSocketImplTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketImplTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.FileDescriptor;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java

diff --git a/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
index 74c9042..776b484 100644
--- a/luni/src/test/java/tests/api/java/net/DatagramSocketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/DatagramSocketTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.io.InterruptedIOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java

diff --git a/luni/src/test/java/tests/api/java/net/HttpCookieTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/HttpCookieTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
index 3cd30f8..172ef8e 100644
--- a/luni/src/test/java/tests/api/java/net/HttpCookieTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/HttpCookieTest.java
@@ -14,7 +14,7 @@
  * License for the specific language governing permissions and limitations under
  * the License.
  */
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import junit.framework.TestCase;
 import java.net.HttpCookie;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java

diff --git a/luni/src/test/java/tests/api/java/net/IDNTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/IDNTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java
index 534fb6e..dfd4d66 100644
--- a/luni/src/test/java/tests/api/java/net/IDNTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/IDNTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.IDN;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java

diff --git a/luni/src/test/java/tests/api/java/net/Inet4AddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/Inet4AddressTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java
index 87fb6df..94df634 100644
--- a/luni/src/test/java/tests/api/java/net/Inet4AddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet4AddressTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.Serializable;
 import java.net.Inet4Address;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java

diff --git a/luni/src/test/java/tests/api/java/net/Inet6AddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/Inet6AddressTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
index ee62fd9..77b8405 100644
--- a/luni/src/test/java/tests/api/java/net/Inet6AddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/Inet6AddressTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.Serializable;
 import java.net.Inet6Address;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java

diff --git a/luni/src/test/java/tests/api/java/net/InetAddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/InetAddressTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
index 520b795..959f83c 100644
--- a/luni/src/test/java/tests/api/java/net/InetAddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.io.Serializable;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java

diff --git a/luni/src/test/java/tests/api/java/net/InetAddressThreadTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/InetAddressThreadTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java
index 0de7f23..840f28e 100644
--- a/luni/src/test/java/tests/api/java/net/InetAddressThreadTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetAddressThreadTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.InetAddress;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java

diff --git a/luni/src/test/java/tests/api/java/net/InetSocketAddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/InetSocketAddressTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java
index bb04040..916ee3e 100644
--- a/luni/src/test/java/tests/api/java/net/InetSocketAddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InetSocketAddressTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.Serializable;
 import java.net.InetSocketAddress;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java

diff --git a/luni/src/test/java/tests/api/java/net/InterfaceAddressTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/InterfaceAddressTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java
index 625283c..c4c2b90 100644
--- a/luni/src/test/java/tests/api/java/net/InterfaceAddressTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/InterfaceAddressTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.Inet4Address;
 import java.net.Inet6Address;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java
index 3c904dd..0b946c1a 100644
--- a/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/JarURLConnectionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import tests.support.resource.Support_Resources;
 import java.io.BufferedOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java
index 1e8364b..d5c2287 100644
--- a/luni/src/test/java/tests/api/java/net/MalformedURLExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MalformedURLExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.MalformedURLException;
 import java.net.URL;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java

diff --git a/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
index 064b1d7..b8444a4 100644
--- a/luni/src/test/java/tests/api/java/net/MulticastSocketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/MulticastSocketTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.net.BindException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java

diff --git a/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java
index e377083..2a93f12 100644
--- a/luni/src/test/java/tests/api/java/net/NetworkInterfaceTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NetworkInterfaceTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.InetAddress;
 import java.net.InterfaceAddress;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java
index bddd414..89fe4fd 100644
--- a/luni/src/test/java/tests/api/java/net/NoRouteToHostExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/NoRouteToHostExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.NoRouteToHostException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java

diff --git a/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java
index 732941c..bbb3011 100644
--- a/luni/src/test/java/tests/api/java/net/PasswordAuthenticationTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/PasswordAuthenticationTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.PasswordAuthentication;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java
index fecf678..d0fe2d9 100644
--- a/luni/src/test/java/tests/api/java/net/ProtocolExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProtocolExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.ProtocolException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java

diff --git a/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java
index 995ffef..3a3bbfe 100644
--- a/luni/src/test/java/tests/api/java/net/ProxySelectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxySelectorTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java

diff --git a/luni/src/test/java/tests/api/java/net/ProxyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/ProxyTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java
index f004683..0487537 100644
--- a/luni/src/test/java/tests/api/java/net/ProxyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ProxyTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.InetSocketAddress;
 import java.net.Proxy;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java

diff --git a/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java
index 51d7f6d..4e79e4a 100644
--- a/luni/src/test/java/tests/api/java/net/ResponseCacheTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ResponseCacheTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.net.CacheRequest;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java

diff --git a/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java
index b7babe7..ab78d65 100644
--- a/luni/src/test/java/tests/api/java/net/SecureCacheResponseTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SecureCacheResponseTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java

diff --git a/luni/src/test/java/tests/api/java/net/ServerSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/ServerSocketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java
index c0e2496..efec70f 100644
--- a/luni/src/test/java/tests/api/java/net/ServerSocketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/ServerSocketTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import tests.support.Support_Configuration;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java
index 8f54494..32c9eb8 100644
--- a/luni/src/test/java/tests/api/java/net/SocketExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.SocketException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java

diff --git a/luni/src/test/java/tests/api/java/net/SocketImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/SocketImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java
index 0be87b6..f6122e5 100644
--- a/luni/src/test/java/tests/api/java/net/SocketImplTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketImplTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.FileDescriptor;
 import java.io.IOException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java

diff --git a/luni/src/test/java/tests/api/java/net/SocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/SocketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java
index fafc80c..53cbab1 100644
--- a/luni/src/test/java/tests/api/java/net/SocketTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.io.InputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java
index 76193e2..14b813c 100644
--- a/luni/src/test/java/tests/api/java/net/SocketTimeoutExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.SocketTimeoutException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java

diff --git a/luni/src/test/java/tests/api/java/net/TestServerSocketInit.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java
similarity index 95%
rename from luni/src/test/java/tests/api/java/net/TestServerSocketInit.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java
index 5727d7e..31aa5b6 100644
--- a/luni/src/test/java/tests/api/java/net/TestServerSocketInit.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/TestServerSocketInit.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.IOException;
 import java.net.ServerSocket;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java
index 9a06d06..ff8ac40 100644
--- a/luni/src/test/java/tests/api/java/net/URISyntaxExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URISyntaxExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.URISyntaxException;
 import java.util.Locale;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java

diff --git a/luni/src/test/java/tests/api/java/net/URITest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/URITest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java
index 51ae52f..f81c975 100644
--- a/luni/src/test/java/tests/api/java/net/URITest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URITest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.MalformedURLException;
 import java.net.URI;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java

diff --git a/luni/src/test/java/tests/api/java/net/URLDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/URLDecoderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java
index d0489d5..f0a8a6d 100644
--- a/luni/src/test/java/tests/api/java/net/URLDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLDecoderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java

diff --git a/luni/src/test/java/tests/api/java/net/URLTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/net/URLTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java
index fb3ff2f..3502e72 100644
--- a/luni/src/test/java/tests/api/java/net/URLTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/URLTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import junit.framework.TestCase;
 import tests.support.resource.Support_Resources;

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java
index d113e92..6d881e7 100644
--- a/luni/src/test/java/tests/api/java/net/UnknownHostExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownHostExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.UnknownHostException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java
index 416a9ff..e141e88 100644
--- a/luni/src/test/java/tests/api/java/net/UnknownServiceExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/net/UnknownServiceExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.net;
+package org.apache.harmony.tests.java.net;
 
 import java.net.UnknownServiceException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java
index d38e1d9..9ea6efc 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractCollectionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractCollectionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractCollection;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java

diff --git a/luni/src/test/java/tests/api/java/util/AbstractListTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/AbstractListTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java
index 4775ebd..efc196f 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractListTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractListTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractList;
 import java.util.ArrayList;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/AbstractMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java
index df96d53..cd06680 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractMapTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractMap;
 import java.util.AbstractSet;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java

diff --git a/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java
index 5ae490c..f123bcf 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractQueueTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractQueueTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractQueue;
 import java.util.ArrayList;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java

diff --git a/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java
index 2068f1b..80ca4fd 100644
--- a/luni/src/test/java/tests/api/java/util/AbstractSequentialListTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/AbstractSequentialListTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractSequentialList;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ArrayDequeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/ArrayDequeTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java
index bf28414..11e6cfc 100644
--- a/luni/src/test/java/tests/api/java/util/ArrayDequeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayDequeTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.ArrayDeque;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ArrayListTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/ArrayListTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
index 8ddf5b7..f2546e0 100644
--- a/luni/src/test/java/tests/api/java/util/ArrayListTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArrayListTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java

diff --git a/luni/src/test/java/tests/api/java/util/Arrays2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/Arrays2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java
index bac98aa..d6adbb5 100644
--- a/luni/src/test/java/tests/api/java/util/Arrays2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Arrays2Test.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ArraysTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/ArraysTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
index 9def233..277abce 100644
--- a/luni/src/test/java/tests/api/java/util/ArraysTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ArraysTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import tests.support.Support_UnmodifiableCollectionTest;
 import java.lang.reflect.Method;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java

diff --git a/luni/src/test/java/tests/api/java/util/BitSetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/BitSetTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java
index 9e71582..96ffccc 100644
--- a/luni/src/test/java/tests/api/java/util/BitSetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/BitSetTest.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.BitSet;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java

diff --git a/luni/src/test/java/tests/api/java/util/CalendarTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/CalendarTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java
index 54524ad..06a37c8 100644
--- a/luni/src/test/java/tests/api/java/util/CalendarTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CalendarTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.text.DateFormatSymbols;
 import java.util.ArrayList;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java

diff --git a/luni/src/test/java/tests/api/java/util/Collections2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/util/Collections2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java
index 5a6c2dc..899cd18 100644
--- a/luni/src/test/java/tests/api/java/util/Collections2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/Collections2Test.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import junit.framework.TestCase;
 import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -414,47 +414,47 @@
     public void test_checkedCollectionSerializationCompatability() throws Exception {
         Collection<String> c = Collections.emptySet();
         c = Collections.checkedCollection(c, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser");
     }
 
     public void test_checkedListRandomAccessSerializationCompatability() throws Exception {
         List<String> c = new ArrayList<String>();
         assertTrue(c instanceof RandomAccess);
         c = Collections.checkedList(c, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser");
     }
 
     public void test_checkedListSerializationCompatability() throws Exception {
         List<String> c = new LinkedList<String>();
         assertFalse(c instanceof RandomAccess);
         c = Collections.checkedList(c, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedList.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser");
     }
 
     public void test_checkedSetSerializationCompatability() throws Exception {
         Set<String> c = new HashSet<String>();
         assertFalse(c instanceof SortedSet);
         c = Collections.checkedSet(c, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSet.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser");
     }
 
     public void test_checkedMapSerializationCompatability() throws Exception {
         Map<String, String> c = new HashMap<String, String>();
         assertFalse(c instanceof SortedMap);
         c = Collections.checkedMap(c, String.class, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedMap.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser");
     }
 
     public void test_checkedSortedSetSerializationCompatability() throws Exception {
         SortedSet<String> c = new TreeSet<String>();
         c = Collections.checkedSortedSet(c, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser");
     }
 
     public void test_checkedSortedMapSerializationCompatability() throws Exception {
         SortedMap<String, String> c = new TreeMap<String, String>();
         c = Collections.checkedSortedMap(c, String.class, String.class);
-        SerializationTester.assertCompabilityEquals(c, "serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser");
+        SerializationTester.assertCompabilityEquals(c, "serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser");
     }
 
     public void test_emptyList() {

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java

diff --git a/luni/src/test/java/tests/api/java/util/CollectionsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/CollectionsTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java
index 58e4ba7..ed25241 100644
--- a/luni/src/test/java/tests/api/java/util/CollectionsTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CollectionsTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java
index 3750e81..2e2553d 100644
--- a/luni/src/test/java/tests/api/java/util/ConcurrentModTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractList;
 import java.util.ArrayList;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java
index 0cd4076..2bbcd1e 100644
--- a/luni/src/test/java/tests/api/java/util/ConcurrentModificationExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ConcurrentModificationExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Collection;
 import java.util.ConcurrentModificationException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ControlTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/ControlTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java
index 3619ea7..d0b236d 100644
--- a/luni/src/test/java/tests/api/java/util/ControlTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ControlTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import junit.framework.TestCase;
 import tests.support.resource.Support_Resources;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java

diff --git a/luni/src/test/java/tests/api/java/util/CurrencyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/CurrencyTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
index 82fd7cf..092cc54 100644
--- a/luni/src/test/java/tests/api/java/util/CurrencyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/CurrencyTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java

diff --git a/luni/src/test/java/tests/api/java/util/DateTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/DateTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java
index f7133d4..0ce971d 100644
--- a/luni/src/test/java/tests/api/java/util/DateTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DateTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Calendar;
 import java.util.Date;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/DuplicateFormatFlagsExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/DuplicateFormatFlagsExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java
index 0fd0005..d59decb 100644
--- a/luni/src/test/java/tests/api/java/util/DuplicateFormatFlagsExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.DuplicateFormatFlagsException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java
index 31ee1e2..fdba5bf 100644
--- a/luni/src/test/java/tests/api/java/util/EmptyStackExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EmptyStackExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.EmptyStackException;
 import java.util.Stack;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/EnumMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/EnumMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java
index 05826d1..2a37a18 100644
--- a/luni/src/test/java/tests/api/java/util/EnumMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumMapTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import dalvik.annotation.AndroidOnly;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java

diff --git a/luni/src/test/java/tests/api/java/util/EnumSetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/EnumSetTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
index 2b33877..612c9f1 100644
--- a/luni/src/test/java/tests/api/java/util/EnumSetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EnumSetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.ArrayList;
 import java.util.Collection;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java

diff --git a/luni/src/test/java/tests/api/java/util/EventObjectTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/EventObjectTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java
index 0f00a81..bea2a44 100644
--- a/luni/src/test/java/tests/api/java/util/EventObjectTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/EventObjectTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.EventObject;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
index decf452..bc9c480 100644
--- a/luni/src/test/java/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.FormatFlagsConversionMismatchException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java

diff --git a/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java
similarity index 95%
rename from luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java
index 4dcd7db..dc51e86 100644
--- a/luni/src/test/java/tests/api/java/util/FormattableFlagsTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormattableFlagsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.FormattableFlags;
 import junit.framework.TestCase;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/FormatterClosedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/util/FormatterClosedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java
index 9d11f70..e89576a 100644
--- a/luni/src/test/java/tests/api/java/util/FormatterClosedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.FormatterClosedException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java

diff --git a/luni/src/test/java/tests/api/java/util/FormatterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/FormatterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java
index c6f7577..c0e814e 100644
--- a/luni/src/test/java/tests/api/java/util/FormatterTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/FormatterTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.BufferedOutputStream;
 import java.io.Closeable;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java

diff --git a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java
index 8b943ed..2c5f308 100644
--- a/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/GregorianCalendarTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.BitSet;
 import java.util.Calendar;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/HashMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/HashMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java
index 5a68adb..26d0a8e 100644
--- a/luni/src/test/java/tests/api/java/util/HashMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashMapTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 import tests.support.Support_MapTest2;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java

diff --git a/luni/src/test/java/tests/api/java/util/HashSetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/HashSetTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java
index e4a65b7..ed9c596 100644
--- a/luni/src/test/java/tests/api/java/util/HashSetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashSetTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Arrays;
 import java.util.HashSet;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java

diff --git a/luni/src/test/java/tests/api/java/util/HashtableTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/HashtableTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java
index 2457398..d71decd 100644
--- a/luni/src/test/java/tests/api/java/util/HashtableTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/HashtableTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import tests.support.Support_MapTest2;
 import tests.support.Support_UnmodifiableCollectionTest;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java

diff --git a/luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java
index 4718d1d..7882077 100644
--- a/luni/src/test/java/tests/api/java/util/IdentityHashMap2Test.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMap2Test.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 import tests.support.Support_MapTest2;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java
index c6e3635..4ddaf65 100644
--- a/luni/src/test/java/tests/api/java/util/IdentityHashMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IdentityHashMapTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 import org.apache.harmony.testframework.serialization.SerializationTest.SerializableAssert;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/IllegalFormatCodePointExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/IllegalFormatCodePointExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java
index d223c8c..ac67e81 100644
--- a/luni/src/test/java/tests/api/java/util/IllegalFormatCodePointExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.IllegalFormatCodePointException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/IllegalFormatConversionExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/IllegalFormatConversionExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java
index 14475fe..2277825 100644
--- a/luni/src/test/java/tests/api/java/util/IllegalFormatConversionExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.IllegalFormatConversionException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/IllegalFormatFlagsExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/IllegalFormatFlagsExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java
index c0f6b31..1611028 100644
--- a/luni/src/test/java/tests/api/java/util/IllegalFormatFlagsExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.IllegalFormatFlagsException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/IllegalFormatPrecisionExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/IllegalFormatPrecisionExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java
index 06863fa..b290b48 100644
--- a/luni/src/test/java/tests/api/java/util/IllegalFormatPrecisionExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.IllegalFormatPrecisionException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/IllegalFormatWidthExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/IllegalFormatWidthExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java
index 49cd632..8d5ed0e 100644
--- a/luni/src/test/java/tests/api/java/util/IllegalFormatWidthExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.IllegalFormatWidthException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/InputMismatchExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/InputMismatchExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java
index 47232b9..30291b3 100644
--- a/luni/src/test/java/tests/api/java/util/InputMismatchExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.InputMismatchException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java
index e9a0495..10bb50e 100644
--- a/luni/src/test/java/tests/api/java/util/InvalidPropertiesFormatExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/InvalidPropertiesFormatExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.NotSerializableException;
 import java.util.InvalidPropertiesFormatException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java
index eff9493..8565b8e 100644
--- a/luni/src/test/java/tests/api/java/util/LinkedHashMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashMapTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractMap;
 import java.util.ArrayList;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java

diff --git a/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java
index f54d01d..721a879 100644
--- a/luni/src/test/java/tests/api/java/util/LinkedHashSetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedHashSetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Arrays;
 import java.util.Collection;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java

diff --git a/luni/src/test/java/tests/api/java/util/LinkedListTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/LinkedListTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
index ed742bc..79607f1 100644
--- a/luni/src/test/java/tests/api/java/util/LinkedListTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LinkedListTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.ArrayList;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java
index 9c5707c..6a85161 100644
--- a/luni/src/test/java/tests/api/java/util/ListResourceBundleTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ListResourceBundleTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Enumeration;
 import java.util.ListResourceBundle;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java

diff --git a/luni/src/test/java/tests/api/java/util/LocaleTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/LocaleTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java
index 6580da8..426e52c 100644
--- a/luni/src/test/java/tests/api/java/util/LocaleTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/LocaleTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Arrays;
 import java.util.HashSet;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/MissingFormatArgumentExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/MissingFormatArgumentExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java
index f3887f5..464960a 100644
--- a/luni/src/test/java/tests/api/java/util/MissingFormatArgumentExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.MissingFormatArgumentException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/MissingFormatWidthExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/MissingFormatWidthExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java
index ffca1c9..cf3d25f 100644
--- a/luni/src/test/java/tests/api/java/util/MissingFormatWidthExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.MissingFormatWidthException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java
index fc7189e..3eb9bac 100644
--- a/luni/src/test/java/tests/api/java/util/MissingResourceExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/MissingResourceExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Locale;
 import java.util.MissingResourceException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java
index cfda941..7727f3f 100644
--- a/luni/src/test/java/tests/api/java/util/NoSuchElementExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/NoSuchElementExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.NoSuchElementException;
 import java.util.Vector;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ObservableTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/ObservableTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java
index 3a0d31c..b13a876 100644
--- a/luni/src/test/java/tests/api/java/util/ObservableTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ObservableTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Observable;
 import java.util.Observer;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java

diff --git a/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java
index d0209a5..9c9d4fe 100644
--- a/luni/src/test/java/tests/api/java/util/PriorityQueueTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PriorityQueueTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -32,7 +32,7 @@
 
 public class PriorityQueueTest extends TestCase {
 
-    private static final String SERIALIZATION_FILE_NAME = "serialization/tests/api/java/util/PriorityQueue.golden.ser";
+    private static final String SERIALIZATION_FILE_NAME = "serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser";
 
     /**
      * java.util.PriorityQueue#iterator()

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java

diff --git a/luni/src/test/java/tests/api/java/util/PropertiesTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/PropertiesTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java
index 5d2ba7b..5b546bb 100644
--- a/luni/src/test/java/tests/api/java/util/PropertiesTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertiesTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import tests.support.resource.Support_Resources;
 import java.io.BufferedReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java

diff --git a/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java
index 085b165..2306ec1 100644
--- a/luni/src/test/java/tests/api/java/util/PropertyResourceBundleTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/PropertyResourceBundleTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.CharArrayReader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java

diff --git a/luni/src/test/java/tests/api/java/util/RandomTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/RandomTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java
index a30fcb6..d51d8abf 100644
--- a/luni/src/test/java/tests/api/java/util/RandomTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RandomTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.Random;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java

diff --git a/luni/src/test/java/tests/api/java/util/RefSortedMap.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/RefSortedMap.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java
index aa4eaa8..4b829af0f 100644
--- a/luni/src/test/java/tests/api/java/util/RefSortedMap.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/RefSortedMap.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.IOException;
 import java.io.ObjectInputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java
index 587a549..11be2fe 100644
--- a/luni/src/test/java/tests/api/java/util/ResourceBundleTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ResourceBundleTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import dalvik.annotation.KnownFailure;
 import java.io.File;
@@ -28,7 +28,7 @@
 import java.util.ResourceBundle;
 import java.util.StringTokenizer;
 import java.util.Vector;
-import tests.api.java.util.support.B;
+import org.apache.harmony.tests.java.util.support.B;
 import tests.support.resource.Support_Resources;
 
 public class ResourceBundleTest extends junit.framework.TestCase {

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java

diff --git a/luni/src/test/java/tests/api/java/util/SampleBundleClass.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java
similarity index 96%
rename from luni/src/test/java/tests/api/java/util/SampleBundleClass.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java
index ceb0901..394291b 100644
--- a/luni/src/test/java/tests/api/java/util/SampleBundleClass.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SampleBundleClass.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.MissingResourceException;
 import java.util.ResourceBundle;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerParseLargeFileBenchmarkTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
similarity index 97%
rename from harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
index 117f211..4b0d1ea 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerParseLargeFileBenchmarkTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.luni.tests.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.IOException;
 import java.io.Reader;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
index b3e1abc..585ba44 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/ScannerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ScannerTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.luni.tests.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java

diff --git a/luni/src/test/java/tests/api/java/util/ServiceConfigurationErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/ServiceConfigurationErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java
index 51a0527..870ef1e 100644
--- a/luni/src/test/java/tests/api/java/util/ServiceConfigurationErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.ServiceConfigurationError;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java

diff --git a/luni/src/test/java/tests/api/java/util/SimpleEntryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/SimpleEntryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java
index 5f8c13d..3f0847f 100644
--- a/luni/src/test/java/tests/api/java/util/SimpleEntryTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleEntryTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import junit.framework.TestCase;
 import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -128,6 +128,6 @@
     @SuppressWarnings({ "unchecked", "boxing" })
     public void testSerializationCompatibility_SimpleEntry() throws Exception {
         SimpleEntry e = new AbstractMap.SimpleEntry<Integer, String>(1, "test");
-        SerializationTester.assertCompabilityEquals(e, "serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser");
+        SerializationTester.assertCompabilityEquals(e, "serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser");
     }
 }

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java

diff --git a/luni/src/test/java/tests/api/java/util/SimpleImmutableEntryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java
similarity index 94%
rename from luni/src/test/java/tests/api/java/util/SimpleImmutableEntryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java
index f2469b6..b83468e 100644
--- a/luni/src/test/java/tests/api/java/util/SimpleImmutableEntryTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleImmutableEntryTest.java
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import junit.framework.TestCase;
 import org.apache.harmony.testframework.serialization.SerializationTest;
@@ -138,9 +138,9 @@
     @SuppressWarnings({ "unchecked", "boxing" })
     public void testSerializationCompatibility_SimpleImmutableEntry() throws Exception {
         SimpleImmutableEntry e = new AbstractMap.SimpleImmutableEntry<Integer, String>(1, "test");
-        if (!(SerializationTester.readObject(e, "serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser") instanceof SimpleImmutableEntry)) {
+        if (!(SerializationTester.readObject(e, "serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser") instanceof SimpleImmutableEntry)) {
             fail("should be SimpleImmutableEntry");
         }
-        SerializationTester.assertCompabilityEquals(e, "serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser");
+        SerializationTester.assertCompabilityEquals(e, "serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser");
     }
 }

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java

diff --git a/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java
index eeb5b30..0fbe7ac 100644
--- a/luni/src/test/java/tests/api/java/util/SimpleTimeZoneTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SimpleTimeZoneTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Calendar;
 import java.util.Date;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java

diff --git a/luni/src/test/java/tests/api/java/util/SortedMapTestBase.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/SortedMapTestBase.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java
index fbf2646..f1fb1e4 100644
--- a/luni/src/test/java/tests/api/java/util/SortedMapTestBase.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/SortedMapTestBase.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java

diff --git a/luni/src/test/java/tests/api/java/util/StackTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/StackTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java
index 5bcd231..7be5a56 100644
--- a/luni/src/test/java/tests/api/java/util/StackTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StackTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.EmptyStackException;
 import java.util.Stack;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java

diff --git a/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java
index d32a466..eeed19f 100644
--- a/luni/src/test/java/tests/api/java/util/StringTokenizerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/StringTokenizerTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.NoSuchElementException;
 import java.util.StringTokenizer;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/TimeZoneTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
index a159113..7e6cade 100644
--- a/luni/src/test/java/tests/api/java/util/TimeZoneTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimeZoneTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import tests.support.Support_TimeZone;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TimerTaskTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/TimerTaskTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java
index 97ff8ea..3e072e7 100644
--- a/luni/src/test/java/tests/api/java/util/TimerTaskTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTaskTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Timer;
 import java.util.TimerTask;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TimerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/TimerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java
index 739c018..85e7c6a 100644
--- a/luni/src/test/java/tests/api/java/util/TimerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TimerTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.util.Date;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java
similarity index 97%
rename from luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java
index 48df5fd..6683e96 100644
--- a/luni/src/test/java/tests/api/java/util/TooManyListenersExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TooManyListenersExceptionTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.TooManyListenersException;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TreeMapExtendTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/TreeMapExtendTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java
index 3927840..5754468 100644
--- a/luni/src/test/java/tests/api/java/util/TreeMapExtendTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapExtendTest.java
@@ -1,4 +1,4 @@
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 /*
  *  Licensed to the Apache Software Foundation (ASF) under one or more
@@ -18,7 +18,7 @@
  */
 
 import junit.framework.TestCase;
-import tests.api.java.util.TreeMapTest.MockComparator;
+import org.apache.harmony.tests.java.util.TreeMapTest.MockComparator;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TreeMapRndTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java
similarity index 95%
rename from luni/src/test/java/tests/api/java/util/TreeMapRndTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java
index 7c57689..bec75a4 100644
--- a/luni/src/test/java/tests/api/java/util/TreeMapRndTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapRndTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.TreeMap;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TreeMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/TreeMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java
index 2bc2ea2..58ffaf6 100644
--- a/luni/src/test/java/tests/api/java/util/TreeMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeMapTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import org.apache.harmony.testframework.serialization.SerializationTest;
 import tests.support.Support_MapTest2;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java

diff --git a/luni/src/test/java/tests/api/java/util/TreeSetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/TreeSetTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java
index 6ad00ee..265f5b9 100644
--- a/luni/src/test/java/tests/api/java/util/TreeSetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/TreeSetTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.Arrays;
 import java.util.Comparator;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java
similarity index 99%
rename from harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java
index d8f4cc4..a56a2d4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/luni/tests/java/util/UUIDTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UUIDTest.java
@@ -15,7 +15,7 @@
  * the License.
  */
 
-package org.apache.harmony.luni.tests.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.UUID;
 

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/UnknownFormatConversionExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/UnknownFormatConversionExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java
index 4880275..a265887 100644
--- a/luni/src/test/java/tests/api/java/util/UnknownFormatConversionExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.UnknownFormatConversionException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java

diff --git a/luni/src/test/java/tests/api/java/util/UnknownFormatFlagsExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java
similarity index 98%
rename from luni/src/test/java/tests/api/java/util/UnknownFormatFlagsExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java
index 9d08f0b1..667ff98 100644
--- a/luni/src/test/java/tests/api/java/util/UnknownFormatFlagsExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.io.Serializable;
 import java.util.UnknownFormatFlagsException;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java

diff --git a/luni/src/test/java/tests/api/java/util/VectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/VectorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
index 4ea3949..e32ca94 100644
--- a/luni/src/test/java/tests/api/java/util/VectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/VectorTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import tests.support.Support_ListTest;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java

diff --git a/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java
similarity index 99%
rename from luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java
index 067abc0..0d34f72 100644
--- a/luni/src/test/java/tests/api/java/util/WeakHashMapTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/WeakHashMapTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.util;
+package org.apache.harmony.tests.java.util;
 
 import java.util.AbstractMap;
 import java.util.Arrays;

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java

diff --git a/luni/src/test/java/tests/api/java/util/support/A.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java
similarity index 79%
rename from luni/src/test/java/tests/api/java/util/support/A.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java
index c2b43b5..a03935a 100644
--- a/luni/src/test/java/tests/api/java/util/support/A.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/A.java
@@ -1,4 +1,4 @@
-package tests.api.java.util.support;
+package org.apache.harmony.tests.java.util.support;
 
 public class A implements I {
     private static P pp = new P();

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java
new file mode 100644
index 0000000..03ebb15
--- /dev/null
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/B.java
@@ -0,0 +1,4 @@
+package org.apache.harmony.tests.java.util.support;
+
+public class B extends A {
+}

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java

diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java
new file mode 100644
index 0000000..4538945
--- /dev/null
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/I.java
@@ -0,0 +1,5 @@
+package org.apache.harmony.tests.java.util.support;
+
+public interface I {
+    String find(String key);
+}

harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java

diff --git a/luni/src/test/java/tests/api/java/util/support/P.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java
similarity index 92%
rename from luni/src/test/java/tests/api/java/util/support/P.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java
index 6883936..bba2537 100644
--- a/luni/src/test/java/tests/api/java/util/support/P.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/util/support/P.java
@@ -1,4 +1,4 @@
-package tests.api.java.util.support;
+package org.apache.harmony.tests.java.util.support;
 
 import java.util.ResourceBundle;
 

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ServerSocketFactoryTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ServerSocketFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ServerSocketFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ServerSocketFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/SocketFactoryTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/SocketFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/SocketFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/SocketFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/CertPathTrustManagerParametersTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertPathTrustManagerParametersTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertificatesToPlayWith.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertificatesToPlayWith.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/CertificatesToPlayWith.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/CertificatesToPlayWith.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/HandshakeCompletedEventTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HandshakeCompletedEventTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/HostnameVerifierTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HostnameVerifierTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HttpsURLConnectionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HttpsURLConnectionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/HttpsURLConnectionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/HttpsURLConnectionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory1Test.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory1Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory1Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory1Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory2Test.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory2Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactory2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactory2Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactorySpiTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactorySpiTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/KeyManagerFactorySpiTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyManagerFactorySpiTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/KeyStoreBuilderParametersTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/KeyStoreBuilderParametersTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext1Test.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext1Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLContext1Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext1Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext2Test.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext2Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLContext2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContext2Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContextSpiTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContextSpiTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLContextSpiTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLContextSpiTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultHandshakeStatusTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultStatusTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultStatusTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultStatusTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultStatusTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLEngineResultTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineResultTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLEngineTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLEngineTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLHandshakeExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLHandshakeExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLHandshakeExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLHandshakeExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLKeyExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLKeyExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLKeyExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLKeyExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLPeerUnverifiedExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLProtocolExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLProtocolExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLProtocolExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLProtocolExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketFactoryTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLServerSocketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLServerSocketTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingEventTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingEventTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingEventTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingEventTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingListenerTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingListenerTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLSessionBindingListenerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionBindingListenerTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionContextTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionContextTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLSessionContextTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionContextTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLSessionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSessionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLSocketFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/SSLSocketTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/SSLSocketTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory1Test.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory1Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory1Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory1Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory2Test.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory2Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactory2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactory2Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactorySpiTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactorySpiTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/TrustManagerFactorySpiTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/TrustManagerFactorySpiTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509ExtendedKeyManagerTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509ExtendedKeyManagerTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/X509ExtendedKeyManagerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509ExtendedKeyManagerTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509KeyManagerTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509KeyManagerTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/X509KeyManagerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509KeyManagerTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509TrustManagerTest.java

diff --git a/luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509TrustManagerTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/net/ssl/X509TrustManagerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/net/ssl/X509TrustManagerTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/CallbackHandlerTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/CallbackHandlerTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/CallbackHandlerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/CallbackHandlerTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyFailedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyFailedExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/DestroyFailedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyFailedExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyableTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyableTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/DestroyableTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/DestroyableTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/LoginExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/LoginExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/LoginExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/LoginExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/PasswordCallbackTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/PasswordCallbackTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/PasswordCallbackTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/PasswordCallbackTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/SubjectTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/SubjectTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/SubjectTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/SubjectTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/UnsupportedCallbackExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/UnsupportedCallbackExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/UnsupportedCallbackExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/UnsupportedCallbackExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/X500PrincipalTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/X500PrincipalTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/auth/X500PrincipalTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/auth/X500PrincipalTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateEncodingExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateEncodingExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/CertificateEncodingExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateEncodingExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/CertificateExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExpiredExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExpiredExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/CertificateExpiredExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateExpiredExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateNotYetValidExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateNotYetValidExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/CertificateNotYetValidExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateNotYetValidExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateParsingExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateParsingExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/CertificateParsingExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateParsingExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/CertificateTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/CertificateTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java

diff --git a/luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/security/cert/X509CertificateTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/security/cert/X509CertificateTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderFactoryTest.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderTest.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/DocumentBuilderTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/DocumentBuilderTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/FactoryConfigurationErrorTest.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/FactoryConfigurationErrorTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/FactoryConfigurationErrorTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/FactoryConfigurationErrorTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/ParserConfigurationExceptionTest.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/ParserConfigurationExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/ParserConfigurationExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/ParserConfigurationExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserFactoryTest.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/SAXParserFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTest.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTestSupport.java

diff --git a/luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java b/harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTestSupport.java
similarity index 100%
rename from luni/src/test/java/tests/api/javax/xml/parsers/SAXParserTestSupport.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/javax/xml/parsers/SAXParserTestSupport.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java

diff --git a/luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/apache/harmony/kernel/dalvik/ThreadsTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/apache/harmony/kernel/dalvik/ThreadsTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/HandlerBaseTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/HandlerBaseTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/HandlerBaseTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/HandlerBaseTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/InputSourceTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/InputSourceTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/InputSourceTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/InputSourceTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXExceptionTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/SAXExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotRecognizedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotRecognizedExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/SAXNotRecognizedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotRecognizedExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotSupportedExceptionTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotSupportedExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/SAXNotSupportedExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXNotSupportedExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXParseExceptionTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXParseExceptionTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/SAXParseExceptionTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/SAXParseExceptionTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Attributes2ImplTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Attributes2ImplTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/ext/Attributes2ImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Attributes2ImplTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/DefaultHandler2Test.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/DefaultHandler2Test.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/ext/DefaultHandler2Test.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/DefaultHandler2Test.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Locator2ImplTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Locator2ImplTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/ext/Locator2ImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/ext/Locator2ImplTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributeListImplTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributeListImplTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/AttributeListImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributeListImplTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributesImplTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributesImplTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/AttributesImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/AttributesImplTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/DefaultHandlerTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/DefaultHandlerTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/DefaultHandlerTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/DefaultHandlerTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/LocatorImplTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/LocatorImplTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/LocatorImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/LocatorImplTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/NamespaceSupportTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/NamespaceSupportTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/NamespaceSupportTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/NamespaceSupportTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserAdapterTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserAdapterTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/ParserAdapterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserAdapterTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserFactoryTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/ParserFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/ParserFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLFilterImplTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLFilterImplTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/XMLFilterImplTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLFilterImplTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderAdapterTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderAdapterTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderAdapterTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderAdapterTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderFactoryTest.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderFactoryTest.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/helpers/XMLReaderFactoryTest.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/helpers/XMLReaderFactoryTest.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/BrokenInputStream.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/BrokenInputStream.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/BrokenInputStream.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/BrokenInputStream.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingParser.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingParser.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/DoNothingParser.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingParser.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingXMLReader.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingXMLReader.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/DoNothingXMLReader.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/DoNothingXMLReader.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MethodLogger.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MethodLogger.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/MethodLogger.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MethodLogger.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockFilter.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockFilter.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/MockFilter.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockFilter.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockHandler.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockHandler.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/MockHandler.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockHandler.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockParser.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockParser.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/MockParser.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockParser.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockReader.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockReader.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/MockReader.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockReader.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockResolver.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockResolver.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/MockResolver.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/MockResolver.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessParser.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessParser.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/NoAccessParser.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessParser.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessXMLReader.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessXMLReader.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/NoAccessXMLReader.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoAccessXMLReader.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceParser.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceParser.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceParser.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceParser.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceXMLReader.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceXMLReader.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/NoInstanceXMLReader.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoInstanceXMLReader.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassParser.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassParser.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassParser.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassParser.java

harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassXMLReader.java

diff --git a/luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java b/harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassXMLReader.java
similarity index 100%
rename from luni/src/test/java/tests/api/org/xml/sax/support/NoSubclassXMLReader.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/org/xml/sax/support/NoSubclassXMLReader.java

harmony-tests/src/test/java/org/apache/harmony/tests/pkg1/TestClass.java

diff --git a/luni/src/test/java/tests/api/pkg1/TestClass.java b/harmony-tests/src/test/java/org/apache/harmony/tests/pkg1/TestClass.java
similarity index 100%
rename from luni/src/test/java/tests/api/pkg1/TestClass.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/pkg1/TestClass.java

harmony-tests/src/test/java/org/apache/harmony/tests/pkg2/TestClass.java

diff --git a/luni/src/test/java/tests/api/pkg2/TestClass.java b/harmony-tests/src/test/java/org/apache/harmony/tests/pkg2/TestClass.java
similarity index 100%
rename from luni/src/test/java/tests/api/pkg2/TestClass.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/pkg2/TestClass.java

harmony-tests/src/test/java/org/apache/harmony/tests/support/A.java

diff --git a/luni/src/test/java/tests/api/support/A.java b/harmony-tests/src/test/java/org/apache/harmony/tests/support/A.java
similarity index 100%
rename from luni/src/test/java/tests/api/support/A.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/support/A.java

harmony-tests/src/test/java/org/apache/harmony/tests/support/B.java

diff --git a/luni/src/test/java/tests/api/support/B.java b/harmony-tests/src/test/java/org/apache/harmony/tests/support/B.java
similarity index 100%
rename from luni/src/test/java/tests/api/support/B.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/support/B.java

harmony-tests/src/test/java/org/apache/harmony/tests/support/I.java

diff --git a/luni/src/test/java/tests/api/support/I.java b/harmony-tests/src/test/java/org/apache/harmony/tests/support/I.java
similarity index 100%
rename from luni/src/test/java/tests/api/support/I.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/support/I.java

harmony-tests/src/test/java/org/apache/harmony/tests/support/P.java

diff --git a/luni/src/test/java/tests/api/support/P.java b/harmony-tests/src/test/java/org/apache/harmony/tests/support/P.java
similarity index 100%
rename from luni/src/test/java/tests/api/support/P.java
rename to harmony-tests/src/test/java/org/apache/harmony/tests/support/P.java

harmony-tests/src/test/resources/resources/dex1.bytes

diff --git a/luni/src/test/resources/tests/api/java/lang/reflect/dex1.bytes b/harmony-tests/src/test/resources/resources/dex1.bytes
similarity index 100%
rename from luni/src/test/resources/tests/api/java/lang/reflect/dex1.bytes
rename to harmony-tests/src/test/resources/resources/dex1.bytes
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/io/FileTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/FileTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/io/IOErrorTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/IOErrorTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser

diff --git a/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDClass.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser
similarity index 100%
rename from luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDClass.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDClass.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser

diff --git a/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDConstructors.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser
similarity index 100%
rename from luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDConstructors.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDConstructors.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser

diff --git a/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDFields.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser
similarity index 100%
rename from luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDFields.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDFields.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser

diff --git a/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDInterfaces.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser
similarity index 100%
rename from luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDInterfaces.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDInterfaces.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser

diff --git a/luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDMethods.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser
similarity index 100%
rename from luni/src/test/resources/serialization/tests/api/java/io/testComputeSUIDMethods.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testComputeSUIDMethods.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_integers.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_integers.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_integers.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_strings.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/io/test_array_strings.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/test_array_strings.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/io/testfile
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/io/testfile

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/AbstractMethodErrorTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/AbstractMethodErrorTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.0.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.0.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.1.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.1.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.2.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.2.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.2.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.3.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.golden.3.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.golden.3.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.harmony.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/EnumTest.harmony.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/EnumTest.harmony.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalArgumentExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalArgumentExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalStateExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/IllegalStateExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/IllegalStateExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/SecurityExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/SecurityExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/SecurityExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBufferTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBufferTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBufferTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBuilderTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/StringBuilderTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/StringBuilderTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/lang/UnsupportedOperationExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/lang/UnsupportedOperationExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/HttpRetryExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/HttpRetryExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/HttpRetryExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet4AddressTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet4AddressTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet4AddressTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.0.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.0.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/Inet6AddressTest.golden.1.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/Inet6AddressTest.golden.1.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetAddressTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/InetAddressTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetAddressTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.0.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.0.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.0.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.1.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/InetSocketAddressTest.golden.1.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/InetSocketAddressTest.golden.1.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/net/SocketTimeoutExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/net/SocketTimeoutExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleEntry.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleEntry.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/AbstractMapTest_SimpleImmutableEntry.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/ArrayDequeTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/ArrayDequeTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ArrayDequeTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/BitSetTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/BitSetTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedCollection.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedCollection.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedList.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedList.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedList.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedListRandomAccess.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedListRandomAccess.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedMap.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedMap.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedMap.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSet.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSet.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSet.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedMap.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedMap.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_CheckedSortedSet.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_CheckedSortedSet.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_asLifoQueue.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_asLifoQueue.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_asLifoQueue.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_newSetFromMap.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/Collections_newSetFromMap.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/Collections_newSetFromMap.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/DuplicateFormatFlagsExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumMapTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumMapTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/EnumSetTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/EnumSetTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatFlagsConversionMismatchExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatterClosedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/FormatterClosedExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/FormatterClosedExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/HashMapTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashMapTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/HashSetTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/HashSetTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/IdentityHashMapTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IdentityHashMapTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatCodePointExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatCodePointExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatConversionExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatConversionExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatFlagsExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatFlagsExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatPrecisionExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/IllegalFormatWidthExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/IllegalFormatWidthExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/InputMismatchExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/InputMismatchExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/InputMismatchExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/LinkedListTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/LinkedListTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/LinkedListTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatArgumentExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatArgumentExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/MissingFormatWidthExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/MissingFormatWidthExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/PriorityQueue.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/PriorityQueue.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/RandomTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/RandomTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/ServiceConfigurationErrorTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/ServiceConfigurationErrorTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser

diff --git a/luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UUIDTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser
similarity index 100%
rename from luni/src/test/resources/serialization/org/apache/harmony/luni/tests/java/util/UUIDTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UUIDTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatConversionExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatConversionExceptionTest.golden.ser
Binary files differ

harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser

diff --git a/harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser
similarity index 100%
rename from harmony-tests/src/test/resources/serialization/tests/api/java/util/UnknownFormatFlagsExceptionTest.golden.ser
rename to harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/util/UnknownFormatFlagsExceptionTest.golden.ser
Binary files differ

luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java

diff --git a/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java b/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java
index 168a00d..ad3cc06 100644
--- a/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java
+++ b/luni/src/test/java/libcore/java/lang/reflect/OldGenericReflectionCornerCases.java
@@ -16,12 +16,12 @@
 
 package libcore.java.lang.reflect;
 
+import org.apache.harmony.tests.java.lang.reflect.GenericReflectionTestsBase;
 import java.lang.reflect.Method;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
 import java.lang.reflect.WildcardType;
-import tests.api.java.lang.reflect.GenericReflectionTestsBase;
 
 /**
  * Tests generic reflection in more complicated cases. In particular: Scoping of

luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java

diff --git a/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java b/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java
index 69eff4f..9dec794 100644
--- a/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java
+++ b/luni/src/test/java/libcore/java/lang/reflect/OldGenericTypesTest.java
@@ -21,7 +21,7 @@
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.lang.reflect.TypeVariable;
-import tests.api.java.lang.reflect.GenericReflectionTestsBase;
+import org.apache.harmony.tests.java.lang.reflect.GenericReflectionTestsBase;
 
 
 /**

luni/src/test/java/tests/api/java/util/support/B.java

diff --git a/luni/src/test/java/tests/api/java/util/support/B.java b/luni/src/test/java/tests/api/java/util/support/B.java
deleted file mode 100644
index baafdbe..0000000
--- a/luni/src/test/java/tests/api/java/util/support/B.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package tests.api.java.util.support;
-
-public class B extends A {
-}

luni/src/test/java/tests/api/java/util/support/I.java

diff --git a/luni/src/test/java/tests/api/java/util/support/I.java b/luni/src/test/java/tests/api/java/util/support/I.java
deleted file mode 100644
index a1cd73a..0000000
--- a/luni/src/test/java/tests/api/java/util/support/I.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package tests.api.java.util.support;
-
-public interface I {
-    String find(String key);
-}