174 files changed, 146 insertions, 144 deletions

diff --git a/harmony-tests/src/test/java/tests/api/java/math/BigDecimalTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/BigDecimalTest.java
index 4fd27bf..20e9237 100644
--- a/harmony-tests/src/test/java/tests/api/java/math/BigDecimalTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/BigDecimalTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.math;
+package org.apache.harmony.tests.java.math;
 
 import java.io.ByteArrayInputStream;
 import java.io.ByteArrayOutputStream;
diff --git a/harmony-tests/src/test/java/tests/api/java/math/BigIntegerTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/BigIntegerTest.java
index 28995cb..337e7c4 100644
--- a/harmony-tests/src/test/java/tests/api/java/math/BigIntegerTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/math/BigIntegerTest.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;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/AbstractBufferTest.java
index eb48992..4da5f8c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/AbstractBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.Buffer;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.java
index 39059fe..234e2e9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.java
index a056ebf..eca02e4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferUnderflowException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ByteBufferTest.java
index d6d8681..aea177a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ByteBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ByteOrderTest.java
index 8f41904..82b5d7a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ByteOrderTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteOrder;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/CharBufferTest.java
index 8a7c5f3..b9f2bc0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/CharBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.io.IOException;
 import java.nio.BufferOverflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectByteBufferTest.java
index f274676..ffdfb2c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectByteBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
index 83cfc9d..71957c1 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
index 561c0fa..0a14a44 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
index 8739c1b..e74eb47 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
index 393366e..e556a31 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
index 245cd25..df1ade5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
index 9ae290a..c5ba915 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DoubleBufferTest.java
index 40ff2e0..50e0b82 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DoubleBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DuplicateDirectByteBufferTest.java
index 656241a..58ac4c3 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DuplicateDirectByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class DuplicateDirectByteBufferTest extends DirectByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DuplicateHeapByteBufferTest.java
index 9f44d7a..452f7cb 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DuplicateHeapByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class DuplicateHeapByteBufferTest extends HeapByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DuplicateWrappedByteBufferTest.java
index 2796b88..8d9c833 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DuplicateWrappedByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class DuplicateWrappedByteBufferTest extends WrappedByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/FloatBufferTest.java
index cfef096..49903bf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/FloatBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapByteBufferTest.java
index 2f8e44b..1ce3c6b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapCharBufferTest.java
index a0c8d74..1ef25c8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapCharBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.CharBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapDoubleBufferTest.java
index 2985899..059adf6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapDoubleBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.DoubleBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapFloatBufferTest.java
index f90b34e..e946857 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapFloatBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.FloatBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapIntBufferTest.java
index 0d68835..1f8e106 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapIntBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.IntBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapLongBufferTest.java
index f4f2ae1..a368ab6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapLongBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.LongBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapShortBufferTest.java
index 327a035..aefbcf4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/HeapShortBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ShortBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/IntBufferTest.java
index 97babcf..7b5f976 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/IntBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.java
index 4b7682d..be8b1bd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.InvalidMarkException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/LongBufferTest.java
index 371351b..e390db8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/LongBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/MappedByteBufferTest.java
index 308db21..0fe6f35 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/MappedByteBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.java
index cbacbc5..d6b553a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ReadOnlyBufferException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyCharBufferTest.java
index f951962..f2669f2 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyCharBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.CharBuffer;
 import java.nio.ReadOnlyBufferException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDirectByteBufferTest.java
index 20c7914..dd7d31a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDirectByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class ReadOnlyDirectByteBufferTest extends DirectByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDoubleBufferTest.java
index d87e81d..f2f1ea4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyDoubleBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.DoubleBuffer;
 import java.nio.ReadOnlyBufferException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyFloatBufferTest.java
index 3acc5c4..56a14ba 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyFloatBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.FloatBuffer;
 import java.nio.ReadOnlyBufferException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapByteBufferTest.java
index 7452a24..025eca6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class ReadOnlyHeapByteBufferTest extends HeapByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapCharBufferTest.java
index 4c7792a..45ba320 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapCharBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.CharBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
index f95c4c2..b978f57 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.DoubleBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
index f2c6644..9b81e3e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.FloatBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapIntBufferTest.java
index f9a3877..8db2ce9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapIntBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.IntBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapLongBufferTest.java
index efba978..3c27dda 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapLongBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.LongBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapShortBufferTest.java
index bbbd616..34ab778 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyHeapShortBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ShortBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyIntBufferTest.java
index 61e78a6..e618783 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyIntBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.IntBuffer;
 import java.nio.ReadOnlyBufferException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyLongBufferTest.java
index b670606..fd6438e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyLongBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.LongBuffer;
 import java.nio.ReadOnlyBufferException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyShortBufferTest.java
index 611f6bf..aab913e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyShortBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ReadOnlyBufferException;
 import java.nio.ShortBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
index 031d75b..21a39ea 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class ReadOnlyWrappedByteBufferTest extends WrappedByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
index 57c04bf..bfa2033 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.CharBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
index d1ba9df..83c53ba 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.DoubleBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
index affddaa..645c8a7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.FloatBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
index a4d0155..9941137 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.IntBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
index 58491da..80f3f88 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.LongBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
index 0ecb3a4..e10a8c0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ShortBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ShortBufferTest.java
index 98d7659..c1c43d7 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/ShortBufferTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/SliceDirectByteBufferTest.java
index 541cde0..c00694a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/SliceDirectByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class SliceDirectByteBufferTest extends DirectByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/SliceHeapByteBufferTest.java
index 9f9f7aa..949c9a0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/SliceHeapByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class SliceHeapByteBufferTest extends HeapByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/SliceWrappedByteBufferTest.java
index f1ddfb9..7fabd8d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/SliceWrappedByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 
 public class SliceWrappedByteBufferTest extends WrappedByteBufferTest {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedByteBufferTest.java
index 6460d2e..9475e7b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedByteBufferTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ByteBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedCharBufferTest1.java
index 9181a77..a9a04e8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedCharBufferTest1.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.CharBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedCharBufferTest2.java
index 5fa9335..a5c222c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedCharBufferTest2.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.BufferOverflowException;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedDoubleBufferTest.java
index f970849..c371afa 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedDoubleBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.DoubleBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedFloatBufferTest.java
index 43b13c3..e68d9bc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedFloatBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.FloatBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedIntBufferTest.java
index 383e964..b1d2bf9 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedIntBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.IntBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedLongBufferTest.java
index 581c912..9bc14c8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedLongBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.LongBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedShortBufferTest.java
index 9c6f781..4c797b5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/WrappedShortBufferTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio;
+package org.apache.harmony.tests.java.nio;
 
 import java.nio.ShortBuffer;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
index ac820a4..8e2a0e6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.AlreadyConnectedException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
index 123eb1f..95eb9fb 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.AsynchronousCloseException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.java
index 7a73322..25ee801 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.CancelledKeyException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ChannelsTest.java
index 4223fb8..e37fd0b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ChannelsTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
index aba37ec..30a486c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.ClosedByInterruptException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.java
index 3ba322f..da1a68e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.ClosedChannelException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.java
index 745d697..8969f02 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.ClosedSelectorException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.java
index 0e909ba..bce227d 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.ConnectionPendingException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java
index cff718e..0b94c39 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/DatagramChannelTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.DatagramPacket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelLockingTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelLockingTest.java
index cb34343..40daa20 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelLockingTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelLockingTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelTest.java
index 9a89f7e..990badc 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
index b60096c..08a7421 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.FileLockInterruptionException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockTest.java
index 12142e8..7e3b671 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/FileLockTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.File;
 import java.io.FileOutputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
index a8cdf83..3384ee5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.IllegalBlockingModeException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.java
index 2fa3171..dabb95f 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.IllegalSelectorException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MapModeTest.java
index 33234eb..13fe11b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MapModeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.FileChannel;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockDatagramChannel.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MockDatagramChannel.java
index c8dc2af..43b146e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockDatagramChannel.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MockDatagramChannel.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.DatagramSocket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockServerSocketChannel.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MockServerSocketChannel.java
index 2058a7a..af090b6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockServerSocketChannel.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MockServerSocketChannel.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSocketChannel.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MockSocketChannel.java
index 9d130ca..beab939 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSocketChannel.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/MockSocketChannel.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.Socket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
index 2ba7ba6..7a99a77 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.NoConnectionPendingException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.java
index 8c44f17..0f59d92 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.NonReadableChannelException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.java
index 459d85a..ffafb38 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.NonWritableChannelException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.java
index d1c2d86..eef3185 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.NotYetBoundException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.java
index 09e4c1c..00284bd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.NotYetConnectedException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
index d06f807..fd11abf 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.OverlappingFileLockException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/PipeTest.java
index 53f19c4..e1de1f5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/PipeTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.NetPermission;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SelectableChannelTest.java
index 25b5f00..a4698bd 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SelectableChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SelectionKeyTest.java
index ed33752..eef10f5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SelectionKeyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.InetSocketAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SelectorTest.java
index ca9e584..0eb51b6 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SelectorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.ServerSocket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java
index fdbbc48..83b838e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/ServerSocketChannelTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java
index 9e96fad..32f59c5 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SinkChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.net.InetAddress;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java
index 7325ba1..4b0cdaa 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SocketChannelTest.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.io.InputStream;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SourceChannelTest.java
index 53fdae4..2d45e61 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/SourceChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnixSelectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/UnixSelectorTest.java
index 8995394..59d8ed8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnixSelectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/UnixSelectorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.net.InetSocketAddress;
 import java.net.ServerSocket;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
index 827dcd7..cb89964 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.UnresolvedAddressException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
index e032ea4..3b47cd4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.harmony.nio.tests.java.nio.channels;
+package org.apache.harmony.tests.java.nio.channels;
 
 import java.nio.channels.UnsupportedAddressTypeException;
 
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
index 5072dc9..d6eb228 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels.spi;
+package org.apache.harmony.tests.java.nio.channels.spi;
 
 import java.io.IOException;
 import java.nio.channels.AsynchronousCloseException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
index b396264..31124ce 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels.spi;
+package org.apache.harmony.tests.java.nio.channels.spi;
 
 import java.io.IOException;
 import java.nio.channels.ClosedChannelException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
index 1404fc1..e0abf8b 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels.spi;
+package org.apache.harmony.tests.java.nio.channels.spi;
 
 import java.nio.channels.SelectableChannel;
 import java.nio.channels.SelectionKey;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractSelectorTest.java
index 4b39001..6f10b11 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/AbstractSelectorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels.spi;
+package org.apache.harmony.tests.java.nio.channels.spi;
 
 import java.io.IOException;
 import java.nio.channels.IllegalBlockingModeException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/MockAbstractSelector.java
index 6e016b0..aa173d8 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/channels/spi/MockAbstractSelector.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio.tests.java.nio.channels.spi;
+package org.apache.harmony.tests.java.nio.channels.spi;
 
 import java.io.IOException;
 import java.nio.channels.SelectionKey;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ASCCharsetDecoderTest.java
index a349b9c..989443a 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/ASCCharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ASCCharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ASCCharsetTest.java
index f46321e..afd95ee 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/ASCCharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ASCCharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 /**
  * Test charset US-ASCII.
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ASCIICharsetEncoderTest.java
index a85576c..3be239c 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/ASCIICharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ASCIICharsetEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/AbstractCharsetTestCase.java
index 0ebf922..536cbce 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/AbstractCharsetTestCase.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/AbstractCharsetTestCase.java
@@ -15,7 +15,7 @@
  *  limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.java
index a45938f..aa69959 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharacterCodingExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.IOException;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoder2Test.java
index 1a7b984..1fd61df 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoder2Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.IOException;
 import java.nio.BufferOverflowException;
@@ -32,7 +32,7 @@ import java.util.Arrays;
 
 import junit.framework.TestCase;
 
-public class CharsetDecoderTest extends TestCase {
+public class CharsetDecoder2Test extends TestCase {
 
     /**
 	 * @tests java.nio.charset.CharsetDecoder.CharsetDecoder(Charset, float,
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoderTest.java
index 7fbe9e7..e64b2b9 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/CharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetDecoderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoder2Test.java
index c3f1a8d..9884625 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoder2Test.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.IOException;
 import java.nio.BufferOverflowException;
@@ -28,7 +28,7 @@ import java.nio.charset.CoderResult;
 
 import junit.framework.TestCase;
 
-public class CharsetEncoderTest extends TestCase {
+public class CharsetEncoder2Test extends TestCase {
 
     /**
      * @tests java.nio.charset.CharsetEncoder.CharsetEncoder(
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoderTest.java
index b63f4d9..89275b8 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/CharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetEncoderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/CharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java
index 92f230e..01cf40e 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/CharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.java
index 8e6318f..1b343ad 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/CoderMalfunctionErrorTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.charset.CoderMalfunctionError;
 
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/CoderResultTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CoderResultTest.java
index 469fc98..dafd21d 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/CoderResultTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CoderResultTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.BufferOverflowException;
 import java.nio.BufferUnderflowException;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CodingErrorActionTest.java
index da293bb..7e408de 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/CodingErrorActionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/CodingErrorActionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.charset.CodingErrorAction;
 
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/GBCharsetDecoderTest.java
index e129c54..3f19877 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/GBCharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/GBCharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/GBCharsetEncoderTest.java
index ab4eeea..02b9062 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/GBCharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/GBCharsetEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ISOCharsetDecoderTest.java
index 82ba9b3..3c8bad4 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/ISOCharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ISOCharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ISOCharsetEncoderTest.java
index 8a84938..1c0bb48 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/ISOCharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ISOCharsetEncoderTest.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ISOCharsetTest.java
index 689dbf3..73f6ffd 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/ISOCharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/ISOCharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 /**
  * Test ISO-8859-1.
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
index a514aef..f5ba3d1 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.Serializable;
 import java.nio.charset.IllegalCharsetNameException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.java
index f482d9d..d288a4a 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/MalformedInputExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.Serializable;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16BECharsetDecoderTest.java
index a8e1343..800353d 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16BECharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16BECharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16BECharsetEncoderTest.java
index 68bd2f5..66970de 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16BECharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16BECharsetEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16BECharsetTest.java
index 52cee90..e951943 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16BECharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16BECharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 /**
  * Test UTF-16BE.
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16CharsetDecoderTest.java
index c5bb408..d47a5c9 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16CharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16CharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16CharsetEncoderTest.java
index 6a42d41..a0f2ac3 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16CharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16CharsetEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.ByteBuffer;
 import java.nio.CharBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16CharsetTest.java
index 61dcf49..7ec7d62 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16CharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16CharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 /**
  * Test UTF-16.
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16LECharsetDecoderTest.java
index e9a8e56..5caacae 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16LECharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16LECharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16LECharsetEncoderTest.java
index 1e9187d..425dc13 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16LECharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16LECharsetEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16LECharsetTest.java
index d795773..a173d06 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF16LECharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF16LECharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 /**
  * Test UTF-16LE.
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF8CharsetTest.java
index 8ab8b5c..e6e328e 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTF8CharsetTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTF8CharsetTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTFCharsetDecoderTest.java
index b8ed9fd..80c9dfc 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTFCharsetDecoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTFCharsetDecoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.ByteBuffer;
diff --git a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTFCharsetEncoderTest.java
index d483fcb..1662ae3 100644
--- a/harmony-tests/src/test/java/tests/api/java/nio/charset/UTFCharsetEncoderTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UTFCharsetEncoderTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package tests.api.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.nio.CharBuffer;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
index a6cf6a6..d9de0d4 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.Serializable;
 import java.nio.charset.CharacterCodingException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
index 57ea31c..be52a84 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/nio_char/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.java
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.apache.harmony.nio_char.tests.java.nio.charset;
+package org.apache.harmony.tests.java.nio.charset;
 
 import java.io.Serializable;
 import java.nio.charset.UnsupportedCharsetException;
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.java
index 14c2e2e..c6eace0 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.java
@@ -484,7 +484,7 @@ public class DecimalFormatSymbolsTest extends TestCase {
         ObjectInputStream i = null;
         try {
             i = new ObjectInputStream(getClass().getClassLoader().getResourceAsStream(
-                    "/serialization/java/text/DecimalFormatSymbols.ser"));
+                    "serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser"));
             dfs = (DecimalFormatSymbols) i.readObject();
         } finally {
             try {
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatTest.java
index 2e3761a..bfb846e 100644
--- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatTest.java
+++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/text/DecimalFormatTest.java
@@ -1726,7 +1726,7 @@ public class DecimalFormatTest extends TestCase {
 
         try {
             oinput = new ObjectInputStream(this.getClass().getResource(
-                    "/serialization/java/text/DecimalFormat.ser").openStream());
+                    "/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser").openStream());
             deserializedDF = (DecimalFormat) oinput.readObject();
         } finally {
             try {
diff --git a/harmony-tests/src/test/resources/META-INF/services/java.nio.charset.spi.CharsetProvider b/harmony-tests/src/test/resources/META-INF/services/java.nio.charset.spi.CharsetProvider
new file mode 100644
index 0000000..9cc124a
--- /dev/null
+++ b/harmony-tests/src/test/resources/META-INF/services/java.nio.charset.spi.CharsetProvider
@@ -0,0 +1,2 @@
+org.apache.harmony.tests.java.nio.charset.CharsetTest$MockCharsetProvider
+org.apache.harmony.tests.java.nio.charset.CharsetTest$MockCharsetProviderASCII
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.golden.ser
new file mode 100644
index 0000000..80e8f7c
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferOverflowExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.golden.ser
new file mode 100644
index 0000000..2e0fc6d
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/BufferUnderflowExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.golden.ser
new file mode 100644
index 0000000..c29debf
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/InvalidMarkExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser
new file mode 100644
index 0000000..fbbc876
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser
new file mode 100644
index 0000000..9bd539c
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser
new file mode 100644
index 0000000..6dbac7d
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser
new file mode 100644
index 0000000..40288df
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser
new file mode 100644
index 0000000..1f1e73b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser
new file mode 100644
index 0000000..ea5b80a
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser
new file mode 100644
index 0000000..1831746
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser
new file mode 100644
index 0000000..9e17263
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser
new file mode 100644
index 0000000..4024191
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser
new file mode 100644
index 0000000..c15c66b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser
new file mode 100644
index 0000000..89ed091
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser
new file mode 100644
index 0000000..022d3bc
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser
new file mode 100644
index 0000000..5cf767c
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser
new file mode 100644
index 0000000..34a42e9
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser
new file mode 100644
index 0000000..69d1a57
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser
new file mode 100644
index 0000000..b5cc027
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser
new file mode 100644
index 0000000..9c0e175
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser
new file mode 100644
index 0000000..2a24deb
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser
new file mode 100644
index 0000000..1dd6a01
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser
new file mode 100644
index 0000000..a95c4e4
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CharacterCodingExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser
new file mode 100644
index 0000000..6f4a4e3
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/CoderMalfunctionErrorTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser
new file mode 100644
index 0000000..59e4d0b
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/IllegalCharsetNameExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser
new file mode 100644
index 0000000..e2f0dec
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/MalformedInputExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser
new file mode 100644
index 0000000..7933fb9
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnmappableCharacterExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser
new file mode 100644
index 0000000..07c63bb
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/nio/charset/UnsupportedCharsetExceptionTest.golden.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser
new file mode 100644
index 0000000..c20fa78
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormat.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser
new file mode 100644
index 0000000..6e086af
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbols.ser
diff --git a/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser
new file mode 100644
index 0000000..c8e3948
--- /dev/null
+++ b/harmony-tests/src/test/resources/serialization/org/apache/harmony/tests/java/text/DecimalFormatSymbolsTest.golden.ser