More merging of nio into luni
Change-Id: Ib4356b3cd57490df8ff246ea6a4bc1c269ba848b
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index cfcd93d..94b1b4d 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -50,7 +50,7 @@
endef
# The Java files and their associated resources.
-core_src_files := $(call all-main-java-files-under,annotation archive auth awt-kernel concurrent crypto dalvik dom icu json junit logging luni luni-kernel math nio nio_char openssl prefs regex security security-kernel sql suncompat support text x-net xml)
+core_src_files := $(call all-main-java-files-under,annotation archive auth awt-kernel concurrent crypto dalvik dom icu json junit logging luni luni-kernel math nio_char openssl prefs regex security security-kernel sql suncompat support text x-net xml)
core_resource_dirs := $(call all-core-resource-dirs,main)
test_resource_dirs := $(call all-core-resource-dirs,test)
@@ -203,7 +203,6 @@
core-tests-logging \
core-tests-luni-kernel \
core-tests-math \
- core-tests-nio \
core-tests-nio_char \
core-tests-prefs \
core-tests-regex \
@@ -229,16 +228,6 @@
include $(BUILD_JAVA_LIBRARY)
include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(call all-test-java-files-under,nio)
-LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
-LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core core-tests-support
-LOCAL_DX_FLAGS := --core-library
-LOCAL_MODULE_TAGS := tests
-LOCAL_MODULE := core-tests-nio
-include $(BUILD_JAVA_LIBRARY)
-
-include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(call all-test-java-files-under,nio_char)
LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs)
LOCAL_NO_STANDARD_LIBRARIES := true
diff --git a/nio/src/main/java/java/nio/BaseByteBuffer.java b/luni/src/main/java/java/nio/BaseByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/BaseByteBuffer.java
rename to luni/src/main/java/java/nio/BaseByteBuffer.java
diff --git a/nio/src/main/java/java/nio/Buffer.java b/luni/src/main/java/java/nio/Buffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/Buffer.java
rename to luni/src/main/java/java/nio/Buffer.java
diff --git a/nio/src/main/java/java/nio/BufferFactory.java b/luni/src/main/java/java/nio/BufferFactory.java
similarity index 100%
rename from nio/src/main/java/java/nio/BufferFactory.java
rename to luni/src/main/java/java/nio/BufferFactory.java
diff --git a/nio/src/main/java/java/nio/BufferOverflowException.java b/luni/src/main/java/java/nio/BufferOverflowException.java
similarity index 100%
rename from nio/src/main/java/java/nio/BufferOverflowException.java
rename to luni/src/main/java/java/nio/BufferOverflowException.java
diff --git a/nio/src/main/java/java/nio/BufferUnderflowException.java b/luni/src/main/java/java/nio/BufferUnderflowException.java
similarity index 100%
rename from nio/src/main/java/java/nio/BufferUnderflowException.java
rename to luni/src/main/java/java/nio/BufferUnderflowException.java
diff --git a/nio/src/main/java/java/nio/ByteBuffer.java b/luni/src/main/java/java/nio/ByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ByteBuffer.java
rename to luni/src/main/java/java/nio/ByteBuffer.java
diff --git a/nio/src/main/java/java/nio/ByteOrder.java b/luni/src/main/java/java/nio/ByteOrder.java
similarity index 100%
rename from nio/src/main/java/java/nio/ByteOrder.java
rename to luni/src/main/java/java/nio/ByteOrder.java
diff --git a/nio/src/main/java/java/nio/CharArrayBuffer.java b/luni/src/main/java/java/nio/CharArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/CharArrayBuffer.java
rename to luni/src/main/java/java/nio/CharArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/CharBuffer.java b/luni/src/main/java/java/nio/CharBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/CharBuffer.java
rename to luni/src/main/java/java/nio/CharBuffer.java
diff --git a/nio/src/main/java/java/nio/CharSequenceAdapter.java b/luni/src/main/java/java/nio/CharSequenceAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/CharSequenceAdapter.java
rename to luni/src/main/java/java/nio/CharSequenceAdapter.java
diff --git a/nio/src/main/java/java/nio/CharToByteBufferAdapter.java b/luni/src/main/java/java/nio/CharToByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/CharToByteBufferAdapter.java
rename to luni/src/main/java/java/nio/CharToByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/DirectByteBuffer.java b/luni/src/main/java/java/nio/DirectByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/DirectByteBuffer.java
rename to luni/src/main/java/java/nio/DirectByteBuffer.java
diff --git a/nio/src/main/java/java/nio/DirectByteBuffers.java b/luni/src/main/java/java/nio/DirectByteBuffers.java
similarity index 100%
rename from nio/src/main/java/java/nio/DirectByteBuffers.java
rename to luni/src/main/java/java/nio/DirectByteBuffers.java
diff --git a/nio/src/main/java/java/nio/DoubleArrayBuffer.java b/luni/src/main/java/java/nio/DoubleArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/DoubleArrayBuffer.java
rename to luni/src/main/java/java/nio/DoubleArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/DoubleBuffer.java b/luni/src/main/java/java/nio/DoubleBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/DoubleBuffer.java
rename to luni/src/main/java/java/nio/DoubleBuffer.java
diff --git a/nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java b/luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/DoubleToByteBufferAdapter.java
rename to luni/src/main/java/java/nio/DoubleToByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/FloatArrayBuffer.java b/luni/src/main/java/java/nio/FloatArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/FloatArrayBuffer.java
rename to luni/src/main/java/java/nio/FloatArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/FloatBuffer.java b/luni/src/main/java/java/nio/FloatBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/FloatBuffer.java
rename to luni/src/main/java/java/nio/FloatBuffer.java
diff --git a/nio/src/main/java/java/nio/FloatToByteBufferAdapter.java b/luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/FloatToByteBufferAdapter.java
rename to luni/src/main/java/java/nio/FloatToByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/HeapByteBuffer.java b/luni/src/main/java/java/nio/HeapByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/HeapByteBuffer.java
rename to luni/src/main/java/java/nio/HeapByteBuffer.java
diff --git a/nio/src/main/java/java/nio/IntArrayBuffer.java b/luni/src/main/java/java/nio/IntArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/IntArrayBuffer.java
rename to luni/src/main/java/java/nio/IntArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/IntBuffer.java b/luni/src/main/java/java/nio/IntBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/IntBuffer.java
rename to luni/src/main/java/java/nio/IntBuffer.java
diff --git a/nio/src/main/java/java/nio/IntToByteBufferAdapter.java b/luni/src/main/java/java/nio/IntToByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/IntToByteBufferAdapter.java
rename to luni/src/main/java/java/nio/IntToByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/InvalidMarkException.java b/luni/src/main/java/java/nio/InvalidMarkException.java
similarity index 100%
rename from nio/src/main/java/java/nio/InvalidMarkException.java
rename to luni/src/main/java/java/nio/InvalidMarkException.java
diff --git a/nio/src/main/java/java/nio/LongArrayBuffer.java b/luni/src/main/java/java/nio/LongArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/LongArrayBuffer.java
rename to luni/src/main/java/java/nio/LongArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/LongBuffer.java b/luni/src/main/java/java/nio/LongBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/LongBuffer.java
rename to luni/src/main/java/java/nio/LongBuffer.java
diff --git a/nio/src/main/java/java/nio/LongToByteBufferAdapter.java b/luni/src/main/java/java/nio/LongToByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/LongToByteBufferAdapter.java
rename to luni/src/main/java/java/nio/LongToByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/MappedByteBuffer.java b/luni/src/main/java/java/nio/MappedByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/MappedByteBuffer.java
rename to luni/src/main/java/java/nio/MappedByteBuffer.java
diff --git a/nio/src/main/java/java/nio/MappedByteBufferAdapter.java b/luni/src/main/java/java/nio/MappedByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/MappedByteBufferAdapter.java
rename to luni/src/main/java/java/nio/MappedByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/NIOAccess.java b/luni/src/main/java/java/nio/NIOAccess.java
similarity index 100%
rename from nio/src/main/java/java/nio/NIOAccess.java
rename to luni/src/main/java/java/nio/NIOAccess.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyBufferException.java b/luni/src/main/java/java/nio/ReadOnlyBufferException.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyBufferException.java
rename to luni/src/main/java/java/nio/ReadOnlyBufferException.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyCharArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java b/luni/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyDirectByteBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyDoubleArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyFloatArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java b/luni/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyHeapByteBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyIntArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyLongArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java b/luni/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadOnlyShortArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteCharArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java b/luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteDirectByteBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteDoubleArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteFloatArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java b/luni/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteHeapByteBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteIntArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteLongArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java b/luni/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
rename to luni/src/main/java/java/nio/ReadWriteShortArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ShortArrayBuffer.java b/luni/src/main/java/java/nio/ShortArrayBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ShortArrayBuffer.java
rename to luni/src/main/java/java/nio/ShortArrayBuffer.java
diff --git a/nio/src/main/java/java/nio/ShortBuffer.java b/luni/src/main/java/java/nio/ShortBuffer.java
similarity index 100%
rename from nio/src/main/java/java/nio/ShortBuffer.java
rename to luni/src/main/java/java/nio/ShortBuffer.java
diff --git a/nio/src/main/java/java/nio/ShortToByteBufferAdapter.java b/luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
similarity index 100%
rename from nio/src/main/java/java/nio/ShortToByteBufferAdapter.java
rename to luni/src/main/java/java/nio/ShortToByteBufferAdapter.java
diff --git a/nio/src/main/java/java/nio/channels/AlreadyConnectedException.java b/luni/src/main/java/java/nio/channels/AlreadyConnectedException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/AlreadyConnectedException.java
rename to luni/src/main/java/java/nio/channels/AlreadyConnectedException.java
diff --git a/nio/src/main/java/java/nio/channels/AsynchronousCloseException.java b/luni/src/main/java/java/nio/channels/AsynchronousCloseException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/AsynchronousCloseException.java
rename to luni/src/main/java/java/nio/channels/AsynchronousCloseException.java
diff --git a/nio/src/main/java/java/nio/channels/ByteChannel.java b/luni/src/main/java/java/nio/channels/ByteChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ByteChannel.java
rename to luni/src/main/java/java/nio/channels/ByteChannel.java
diff --git a/nio/src/main/java/java/nio/channels/CancelledKeyException.java b/luni/src/main/java/java/nio/channels/CancelledKeyException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/CancelledKeyException.java
rename to luni/src/main/java/java/nio/channels/CancelledKeyException.java
diff --git a/nio/src/main/java/java/nio/channels/Channel.java b/luni/src/main/java/java/nio/channels/Channel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/Channel.java
rename to luni/src/main/java/java/nio/channels/Channel.java
diff --git a/nio/src/main/java/java/nio/channels/Channels.java b/luni/src/main/java/java/nio/channels/Channels.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/Channels.java
rename to luni/src/main/java/java/nio/channels/Channels.java
diff --git a/nio/src/main/java/java/nio/channels/ClosedByInterruptException.java b/luni/src/main/java/java/nio/channels/ClosedByInterruptException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ClosedByInterruptException.java
rename to luni/src/main/java/java/nio/channels/ClosedByInterruptException.java
diff --git a/nio/src/main/java/java/nio/channels/ClosedChannelException.java b/luni/src/main/java/java/nio/channels/ClosedChannelException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ClosedChannelException.java
rename to luni/src/main/java/java/nio/channels/ClosedChannelException.java
diff --git a/nio/src/main/java/java/nio/channels/ClosedSelectorException.java b/luni/src/main/java/java/nio/channels/ClosedSelectorException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ClosedSelectorException.java
rename to luni/src/main/java/java/nio/channels/ClosedSelectorException.java
diff --git a/nio/src/main/java/java/nio/channels/ConnectionPendingException.java b/luni/src/main/java/java/nio/channels/ConnectionPendingException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ConnectionPendingException.java
rename to luni/src/main/java/java/nio/channels/ConnectionPendingException.java
diff --git a/nio/src/main/java/java/nio/channels/DatagramChannel.java b/luni/src/main/java/java/nio/channels/DatagramChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/DatagramChannel.java
rename to luni/src/main/java/java/nio/channels/DatagramChannel.java
diff --git a/nio/src/main/java/java/nio/channels/FileChannel.java b/luni/src/main/java/java/nio/channels/FileChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/FileChannel.java
rename to luni/src/main/java/java/nio/channels/FileChannel.java
diff --git a/nio/src/main/java/java/nio/channels/FileLock.java b/luni/src/main/java/java/nio/channels/FileLock.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/FileLock.java
rename to luni/src/main/java/java/nio/channels/FileLock.java
diff --git a/nio/src/main/java/java/nio/channels/FileLockInterruptionException.java b/luni/src/main/java/java/nio/channels/FileLockInterruptionException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/FileLockInterruptionException.java
rename to luni/src/main/java/java/nio/channels/FileLockInterruptionException.java
diff --git a/nio/src/main/java/java/nio/channels/GatheringByteChannel.java b/luni/src/main/java/java/nio/channels/GatheringByteChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/GatheringByteChannel.java
rename to luni/src/main/java/java/nio/channels/GatheringByteChannel.java
diff --git a/nio/src/main/java/java/nio/channels/IllegalBlockingModeException.java b/luni/src/main/java/java/nio/channels/IllegalBlockingModeException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/IllegalBlockingModeException.java
rename to luni/src/main/java/java/nio/channels/IllegalBlockingModeException.java
diff --git a/nio/src/main/java/java/nio/channels/IllegalSelectorException.java b/luni/src/main/java/java/nio/channels/IllegalSelectorException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/IllegalSelectorException.java
rename to luni/src/main/java/java/nio/channels/IllegalSelectorException.java
diff --git a/nio/src/main/java/java/nio/channels/InterruptibleChannel.java b/luni/src/main/java/java/nio/channels/InterruptibleChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/InterruptibleChannel.java
rename to luni/src/main/java/java/nio/channels/InterruptibleChannel.java
diff --git a/nio/src/main/java/java/nio/channels/NoConnectionPendingException.java b/luni/src/main/java/java/nio/channels/NoConnectionPendingException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/NoConnectionPendingException.java
rename to luni/src/main/java/java/nio/channels/NoConnectionPendingException.java
diff --git a/nio/src/main/java/java/nio/channels/NonReadableChannelException.java b/luni/src/main/java/java/nio/channels/NonReadableChannelException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/NonReadableChannelException.java
rename to luni/src/main/java/java/nio/channels/NonReadableChannelException.java
diff --git a/nio/src/main/java/java/nio/channels/NonWritableChannelException.java b/luni/src/main/java/java/nio/channels/NonWritableChannelException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/NonWritableChannelException.java
rename to luni/src/main/java/java/nio/channels/NonWritableChannelException.java
diff --git a/nio/src/main/java/java/nio/channels/NotYetBoundException.java b/luni/src/main/java/java/nio/channels/NotYetBoundException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/NotYetBoundException.java
rename to luni/src/main/java/java/nio/channels/NotYetBoundException.java
diff --git a/nio/src/main/java/java/nio/channels/NotYetConnectedException.java b/luni/src/main/java/java/nio/channels/NotYetConnectedException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/NotYetConnectedException.java
rename to luni/src/main/java/java/nio/channels/NotYetConnectedException.java
diff --git a/nio/src/main/java/java/nio/channels/OverlappingFileLockException.java b/luni/src/main/java/java/nio/channels/OverlappingFileLockException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/OverlappingFileLockException.java
rename to luni/src/main/java/java/nio/channels/OverlappingFileLockException.java
diff --git a/nio/src/main/java/java/nio/channels/Pipe.java b/luni/src/main/java/java/nio/channels/Pipe.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/Pipe.java
rename to luni/src/main/java/java/nio/channels/Pipe.java
diff --git a/nio/src/main/java/java/nio/channels/ReadableByteChannel.java b/luni/src/main/java/java/nio/channels/ReadableByteChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ReadableByteChannel.java
rename to luni/src/main/java/java/nio/channels/ReadableByteChannel.java
diff --git a/nio/src/main/java/java/nio/channels/ScatteringByteChannel.java b/luni/src/main/java/java/nio/channels/ScatteringByteChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ScatteringByteChannel.java
rename to luni/src/main/java/java/nio/channels/ScatteringByteChannel.java
diff --git a/nio/src/main/java/java/nio/channels/SelectableChannel.java b/luni/src/main/java/java/nio/channels/SelectableChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/SelectableChannel.java
rename to luni/src/main/java/java/nio/channels/SelectableChannel.java
diff --git a/nio/src/main/java/java/nio/channels/SelectionKey.java b/luni/src/main/java/java/nio/channels/SelectionKey.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/SelectionKey.java
rename to luni/src/main/java/java/nio/channels/SelectionKey.java
diff --git a/nio/src/main/java/java/nio/channels/Selector.java b/luni/src/main/java/java/nio/channels/Selector.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/Selector.java
rename to luni/src/main/java/java/nio/channels/Selector.java
diff --git a/nio/src/main/java/java/nio/channels/ServerSocketChannel.java b/luni/src/main/java/java/nio/channels/ServerSocketChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/ServerSocketChannel.java
rename to luni/src/main/java/java/nio/channels/ServerSocketChannel.java
diff --git a/nio/src/main/java/java/nio/channels/SocketChannel.java b/luni/src/main/java/java/nio/channels/SocketChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/SocketChannel.java
rename to luni/src/main/java/java/nio/channels/SocketChannel.java
diff --git a/nio/src/main/java/java/nio/channels/UnresolvedAddressException.java b/luni/src/main/java/java/nio/channels/UnresolvedAddressException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/UnresolvedAddressException.java
rename to luni/src/main/java/java/nio/channels/UnresolvedAddressException.java
diff --git a/nio/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java b/luni/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
rename to luni/src/main/java/java/nio/channels/UnsupportedAddressTypeException.java
diff --git a/nio/src/main/java/java/nio/channels/WritableByteChannel.java b/luni/src/main/java/java/nio/channels/WritableByteChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/WritableByteChannel.java
rename to luni/src/main/java/java/nio/channels/WritableByteChannel.java
diff --git a/nio/src/main/java/java/nio/channels/package.html b/luni/src/main/java/java/nio/channels/package.html
similarity index 100%
rename from nio/src/main/java/java/nio/channels/package.html
rename to luni/src/main/java/java/nio/channels/package.html
diff --git a/nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java b/luni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
rename to luni/src/main/java/java/nio/channels/spi/AbstractInterruptibleChannel.java
diff --git a/nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
rename to luni/src/main/java/java/nio/channels/spi/AbstractSelectableChannel.java
diff --git a/nio/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
rename to luni/src/main/java/java/nio/channels/spi/AbstractSelectionKey.java
diff --git a/nio/src/main/java/java/nio/channels/spi/AbstractSelector.java b/luni/src/main/java/java/nio/channels/spi/AbstractSelector.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/spi/AbstractSelector.java
rename to luni/src/main/java/java/nio/channels/spi/AbstractSelector.java
diff --git a/nio/src/main/java/java/nio/channels/spi/SelectorProvider.java b/luni/src/main/java/java/nio/channels/spi/SelectorProvider.java
similarity index 100%
rename from nio/src/main/java/java/nio/channels/spi/SelectorProvider.java
rename to luni/src/main/java/java/nio/channels/spi/SelectorProvider.java
diff --git a/nio/src/main/java/java/nio/channels/spi/package.html b/luni/src/main/java/java/nio/channels/spi/package.html
similarity index 100%
rename from nio/src/main/java/java/nio/channels/spi/package.html
rename to luni/src/main/java/java/nio/channels/spi/package.html
diff --git a/nio/src/main/java/java/nio/package.html b/luni/src/main/java/java/nio/package.html
similarity index 100%
rename from nio/src/main/java/java/nio/package.html
rename to luni/src/main/java/java/nio/package.html
diff --git a/nio/src/main/java/org/apache/harmony/nio/AddressUtil.java b/luni/src/main/java/org/apache/harmony/nio/AddressUtil.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/AddressUtil.java
rename to luni/src/main/java/org/apache/harmony/nio/AddressUtil.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java b/luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
rename to luni/src/main/java/org/apache/harmony/nio/FileChannelFactory.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/DatagramChannelImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java b/luni/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/DirectBuffer.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/FileChannelImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/FileLockImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/IOUtil.java b/luni/src/main/java/org/apache/harmony/nio/internal/IOUtil.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/IOUtil.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/IOUtil.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java b/luni/src/main/java/org/apache/harmony/nio/internal/LockManager.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/LockManager.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/LockManager.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java b/luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/MappedByteBufferFactory.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/PipeImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/ReadOnlyFileChannel.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/ReadWriteFileChannel.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/SelectionKeyImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SelectionKeyImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/SelectionKeyImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/SelectionKeyImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/SelectorImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/SelectorProviderImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SelectorProviderImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/SelectorProviderImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/SelectorProviderImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/ServerSocketChannelImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java b/luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/SocketChannelImpl.java
diff --git a/nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java b/luni/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
similarity index 100%
rename from nio/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
rename to luni/src/main/java/org/apache/harmony/nio/internal/WriteOnlyFileChannel.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AbstractBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/AllTests.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ByteOrderTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/CharBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectCharBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectDoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectFloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectIntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectLongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DirectShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateDirectByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateHeapByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/DuplicateWrappedByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/FloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapCharBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapDoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapFloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapIntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapLongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/HeapShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/IntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/LongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/MappedByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyCharBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDirectByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyDoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyFloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapCharBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapDoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapFloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapIntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapLongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyHeapShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyIntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyLongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedCharBufferTest1.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedDoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedFloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedIntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedLongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ReadOnlyWrappedShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/ShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceDirectByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceHeapByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/SliceWrappedByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedByteBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest1.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedCharBufferTest2.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedDoubleBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedFloatBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedIntBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedLongBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/WrappedShortBufferTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AllTests.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ChannelsTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/DatagramChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/FileLockTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MapModeTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockDatagramChannel.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockDatagramChannel.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockDatagramChannel.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockDatagramChannel.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSecurityManager.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSecurityManager.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSecurityManager.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSecurityManager.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockServerSocketChannel.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockServerSocketChannel.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockServerSocketChannel.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockServerSocketChannel.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSocketChannel.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSocketChannel.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSocketChannel.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/MockSocketChannel.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/PipeTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectableChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectionKeyTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SelectorTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/ServerSocketChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SinkChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SocketChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/SourceChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractInterruptibleChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectableChannelTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectionKeyTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AbstractSelectorTest.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/AllTests.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/MockAbstractSelector.java
diff --git a/nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java b/luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java
similarity index 100%
rename from nio/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java
rename to luni/src/test/java/org/apache/harmony/nio/tests/java/nio/channels/spi/SelectorProviderTest.java
diff --git a/nio/src/test/java/tests/nio/AllTests.java b/luni/src/test/java/tests/nio/AllTests.java
similarity index 100%
rename from nio/src/test/java/tests/nio/AllTests.java
rename to luni/src/test/java/tests/nio/AllTests.java
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferOverflowExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/BufferUnderflowExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/InvalidMarkExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/ReadOnlyBufferExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AlreadyConnectedExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/AsynchronousCloseExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/CancelledKeyExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedByInterruptExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedChannelExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ClosedSelectorExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/ConnectionPendingExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/FileLockInterruptionExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalBlockingModeExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/IllegalSelectorExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NoConnectionPendingExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonReadableChannelExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NonWritableChannelExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetBoundExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/NotYetConnectedExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/OverlappingFileLockExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnresolvedAddressExceptionTest.golden.ser
Binary files differ
diff --git a/nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser b/luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser
similarity index 100%
rename from nio/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser
rename to luni/src/test/resources/serialization/org/apache/harmony/nio/tests/java/nio/channels/UnsupportedAddressTypeExceptionTest.golden.ser
Binary files differ
diff --git a/nio/MODULE_LICENSE_APACHE2 b/nio/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29..0000000
--- a/nio/MODULE_LICENSE_APACHE2
+++ /dev/null
diff --git a/run-core-tests b/run-core-tests
index 345f23b..95e034e 100755
--- a/run-core-tests
+++ b/run-core-tests
@@ -26,7 +26,7 @@
# Build the classpath by putting together the jar file for each module.
classpath="/system/framework/sqlite-jdbc.jar" # Bonus item for jdbc testing.
modules="annotation archive concurrent crypto dom json \
- logging luni-kernel luni math nio nio_char prefs regex security sql \
+ logging luni-kernel luni math nio_char prefs regex security sql \
suncompat support text x-net xml"
for module in $modules; do
classpath="$classpath:/system/framework/core-tests-$module.jar"