diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessage.java b/java/src/main/java/com/google/protobuf/AbstractMessage.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/AbstractMessage.java
rename to java/src/main/java/com/google/protobuf/AbstractMessage.java
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java b/java/src/main/java/com/google/protobuf/AbstractMessageLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/AbstractMessageLite.java
rename to java/src/main/java/com/google/protobuf/AbstractMessageLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractParser.java b/java/src/main/java/com/google/protobuf/AbstractParser.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/AbstractParser.java
rename to java/src/main/java/com/google/protobuf/AbstractParser.java
diff --git a/java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java b/java/src/main/java/com/google/protobuf/AbstractProtobufList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/AbstractProtobufList.java
rename to java/src/main/java/com/google/protobuf/AbstractProtobufList.java
diff --git a/java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java b/java/src/main/java/com/google/protobuf/BlockingRpcChannel.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/BlockingRpcChannel.java
rename to java/src/main/java/com/google/protobuf/BlockingRpcChannel.java
diff --git a/java/core/src/main/java/com/google/protobuf/BlockingService.java b/java/src/main/java/com/google/protobuf/BlockingService.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/BlockingService.java
rename to java/src/main/java/com/google/protobuf/BlockingService.java
diff --git a/java/core/src/main/java/com/google/protobuf/BooleanArrayList.java b/java/src/main/java/com/google/protobuf/BooleanArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/BooleanArrayList.java
rename to java/src/main/java/com/google/protobuf/BooleanArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/BoundedByteString.java b/java/src/main/java/com/google/protobuf/BoundedByteString.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/BoundedByteString.java
rename to java/src/main/java/com/google/protobuf/BoundedByteString.java
diff --git a/java/core/src/main/java/com/google/protobuf/ByteString.java b/java/src/main/java/com/google/protobuf/ByteString.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ByteString.java
rename to java/src/main/java/com/google/protobuf/ByteString.java
diff --git a/java/core/src/main/java/com/google/protobuf/CodedInputStream.java b/java/src/main/java/com/google/protobuf/CodedInputStream.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/CodedInputStream.java
rename to java/src/main/java/com/google/protobuf/CodedInputStream.java
diff --git a/java/core/src/main/java/com/google/protobuf/CodedOutputStream.java b/java/src/main/java/com/google/protobuf/CodedOutputStream.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/CodedOutputStream.java
rename to java/src/main/java/com/google/protobuf/CodedOutputStream.java
diff --git a/java/core/src/main/java/com/google/protobuf/Descriptors.java b/java/src/main/java/com/google/protobuf/Descriptors.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Descriptors.java
rename to java/src/main/java/com/google/protobuf/Descriptors.java
diff --git a/java/core/src/main/java/com/google/protobuf/DoubleArrayList.java b/java/src/main/java/com/google/protobuf/DoubleArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/DoubleArrayList.java
rename to java/src/main/java/com/google/protobuf/DoubleArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/DynamicMessage.java b/java/src/main/java/com/google/protobuf/DynamicMessage.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/DynamicMessage.java
rename to java/src/main/java/com/google/protobuf/DynamicMessage.java
diff --git a/java/core/src/main/java/com/google/protobuf/Extension.java b/java/src/main/java/com/google/protobuf/Extension.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Extension.java
rename to java/src/main/java/com/google/protobuf/Extension.java
diff --git a/java/core/src/main/java/com/google/protobuf/ExtensionLite.java b/java/src/main/java/com/google/protobuf/ExtensionLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ExtensionLite.java
rename to java/src/main/java/com/google/protobuf/ExtensionLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java b/java/src/main/java/com/google/protobuf/ExtensionRegistry.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ExtensionRegistry.java
rename to java/src/main/java/com/google/protobuf/ExtensionRegistry.java
diff --git a/java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java b/java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
rename to java/src/main/java/com/google/protobuf/ExtensionRegistryLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/FieldSet.java b/java/src/main/java/com/google/protobuf/FieldSet.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/FieldSet.java
rename to java/src/main/java/com/google/protobuf/FieldSet.java
diff --git a/java/core/src/main/java/com/google/protobuf/FloatArrayList.java b/java/src/main/java/com/google/protobuf/FloatArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/FloatArrayList.java
rename to java/src/main/java/com/google/protobuf/FloatArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessage.java b/java/src/main/java/com/google/protobuf/GeneratedMessage.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/GeneratedMessage.java
rename to java/src/main/java/com/google/protobuf/GeneratedMessage.java
diff --git a/java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java b/java/src/main/java/com/google/protobuf/GeneratedMessageLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/GeneratedMessageLite.java
rename to java/src/main/java/com/google/protobuf/GeneratedMessageLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/IntArrayList.java b/java/src/main/java/com/google/protobuf/IntArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/IntArrayList.java
rename to java/src/main/java/com/google/protobuf/IntArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/Internal.java b/java/src/main/java/com/google/protobuf/Internal.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Internal.java
rename to java/src/main/java/com/google/protobuf/Internal.java
diff --git a/java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java b/java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
rename to java/src/main/java/com/google/protobuf/InvalidProtocolBufferException.java
diff --git a/java/core/src/main/java/com/google/protobuf/LazyField.java b/java/src/main/java/com/google/protobuf/LazyField.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/LazyField.java
rename to java/src/main/java/com/google/protobuf/LazyField.java
diff --git a/java/core/src/main/java/com/google/protobuf/LazyFieldLite.java b/java/src/main/java/com/google/protobuf/LazyFieldLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/LazyFieldLite.java
rename to java/src/main/java/com/google/protobuf/LazyFieldLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java b/java/src/main/java/com/google/protobuf/LazyStringArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/LazyStringArrayList.java
rename to java/src/main/java/com/google/protobuf/LazyStringArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/LazyStringList.java b/java/src/main/java/com/google/protobuf/LazyStringList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/LazyStringList.java
rename to java/src/main/java/com/google/protobuf/LazyStringList.java
diff --git a/java/core/src/main/java/com/google/protobuf/LiteralByteString.java b/java/src/main/java/com/google/protobuf/LiteralByteString.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/LiteralByteString.java
rename to java/src/main/java/com/google/protobuf/LiteralByteString.java
diff --git a/java/core/src/main/java/com/google/protobuf/LongArrayList.java b/java/src/main/java/com/google/protobuf/LongArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/LongArrayList.java
rename to java/src/main/java/com/google/protobuf/LongArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/MapEntry.java b/java/src/main/java/com/google/protobuf/MapEntry.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MapEntry.java
rename to java/src/main/java/com/google/protobuf/MapEntry.java
diff --git a/java/core/src/main/java/com/google/protobuf/MapEntryLite.java b/java/src/main/java/com/google/protobuf/MapEntryLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MapEntryLite.java
rename to java/src/main/java/com/google/protobuf/MapEntryLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/MapField.java b/java/src/main/java/com/google/protobuf/MapField.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MapField.java
rename to java/src/main/java/com/google/protobuf/MapField.java
diff --git a/java/core/src/main/java/com/google/protobuf/MapFieldLite.java b/java/src/main/java/com/google/protobuf/MapFieldLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MapFieldLite.java
rename to java/src/main/java/com/google/protobuf/MapFieldLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/Message.java b/java/src/main/java/com/google/protobuf/Message.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Message.java
rename to java/src/main/java/com/google/protobuf/Message.java
diff --git a/java/core/src/main/java/com/google/protobuf/MessageLite.java b/java/src/main/java/com/google/protobuf/MessageLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MessageLite.java
rename to java/src/main/java/com/google/protobuf/MessageLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java b/java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
rename to java/src/main/java/com/google/protobuf/MessageLiteOrBuilder.java
diff --git a/java/core/src/main/java/com/google/protobuf/MessageLiteToString.java b/java/src/main/java/com/google/protobuf/MessageLiteToString.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MessageLiteToString.java
rename to java/src/main/java/com/google/protobuf/MessageLiteToString.java
diff --git a/java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java b/java/src/main/java/com/google/protobuf/MessageOrBuilder.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MessageOrBuilder.java
rename to java/src/main/java/com/google/protobuf/MessageOrBuilder.java
diff --git a/java/core/src/main/java/com/google/protobuf/MessageReflection.java b/java/src/main/java/com/google/protobuf/MessageReflection.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MessageReflection.java
rename to java/src/main/java/com/google/protobuf/MessageReflection.java
diff --git a/java/core/src/main/java/com/google/protobuf/MutabilityOracle.java b/java/src/main/java/com/google/protobuf/MutabilityOracle.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/MutabilityOracle.java
rename to java/src/main/java/com/google/protobuf/MutabilityOracle.java
diff --git a/java/core/src/main/java/com/google/protobuf/NioByteString.java b/java/src/main/java/com/google/protobuf/NioByteString.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/NioByteString.java
rename to java/src/main/java/com/google/protobuf/NioByteString.java
diff --git a/java/core/src/main/java/com/google/protobuf/Parser.java b/java/src/main/java/com/google/protobuf/Parser.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Parser.java
rename to java/src/main/java/com/google/protobuf/Parser.java
diff --git a/java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java b/java/src/main/java/com/google/protobuf/ProtobufArrayList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ProtobufArrayList.java
rename to java/src/main/java/com/google/protobuf/ProtobufArrayList.java
diff --git a/java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java b/java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
rename to java/src/main/java/com/google/protobuf/ProtocolMessageEnum.java
diff --git a/java/core/src/main/java/com/google/protobuf/ProtocolStringList.java b/java/src/main/java/com/google/protobuf/ProtocolStringList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ProtocolStringList.java
rename to java/src/main/java/com/google/protobuf/ProtocolStringList.java
diff --git a/java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java b/java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
rename to java/src/main/java/com/google/protobuf/RepeatedFieldBuilder.java
diff --git a/java/core/src/main/java/com/google/protobuf/RopeByteString.java b/java/src/main/java/com/google/protobuf/RopeByteString.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/RopeByteString.java
rename to java/src/main/java/com/google/protobuf/RopeByteString.java
diff --git a/java/core/src/main/java/com/google/protobuf/RpcCallback.java b/java/src/main/java/com/google/protobuf/RpcCallback.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/RpcCallback.java
rename to java/src/main/java/com/google/protobuf/RpcCallback.java
diff --git a/java/core/src/main/java/com/google/protobuf/RpcChannel.java b/java/src/main/java/com/google/protobuf/RpcChannel.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/RpcChannel.java
rename to java/src/main/java/com/google/protobuf/RpcChannel.java
diff --git a/java/core/src/main/java/com/google/protobuf/RpcController.java b/java/src/main/java/com/google/protobuf/RpcController.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/RpcController.java
rename to java/src/main/java/com/google/protobuf/RpcController.java
diff --git a/java/core/src/main/java/com/google/protobuf/RpcUtil.java b/java/src/main/java/com/google/protobuf/RpcUtil.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/RpcUtil.java
rename to java/src/main/java/com/google/protobuf/RpcUtil.java
diff --git a/java/core/src/main/java/com/google/protobuf/Service.java b/java/src/main/java/com/google/protobuf/Service.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Service.java
rename to java/src/main/java/com/google/protobuf/Service.java
diff --git a/java/core/src/main/java/com/google/protobuf/ServiceException.java b/java/src/main/java/com/google/protobuf/ServiceException.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/ServiceException.java
rename to java/src/main/java/com/google/protobuf/ServiceException.java
diff --git a/java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java b/java/src/main/java/com/google/protobuf/SingleFieldBuilder.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/SingleFieldBuilder.java
rename to java/src/main/java/com/google/protobuf/SingleFieldBuilder.java
diff --git a/java/core/src/main/java/com/google/protobuf/SmallSortedMap.java b/java/src/main/java/com/google/protobuf/SmallSortedMap.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/SmallSortedMap.java
rename to java/src/main/java/com/google/protobuf/SmallSortedMap.java
diff --git a/java/core/src/main/java/com/google/protobuf/TextFormat.java b/java/src/main/java/com/google/protobuf/TextFormat.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/TextFormat.java
rename to java/src/main/java/com/google/protobuf/TextFormat.java
diff --git a/java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java b/java/src/main/java/com/google/protobuf/TextFormatEscaper.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/TextFormatEscaper.java
rename to java/src/main/java/com/google/protobuf/TextFormatEscaper.java
diff --git a/java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java b/java/src/main/java/com/google/protobuf/UninitializedMessageException.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/UninitializedMessageException.java
rename to java/src/main/java/com/google/protobuf/UninitializedMessageException.java
diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java b/java/src/main/java/com/google/protobuf/UnknownFieldSet.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/UnknownFieldSet.java
rename to java/src/main/java/com/google/protobuf/UnknownFieldSet.java
diff --git a/java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java b/java/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
rename to java/src/main/java/com/google/protobuf/UnknownFieldSetLite.java
diff --git a/java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java b/java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
rename to java/src/main/java/com/google/protobuf/UnmodifiableLazyStringList.java
diff --git a/java/core/src/main/java/com/google/protobuf/UnsafeByteStrings.java b/java/src/main/java/com/google/protobuf/UnsafeByteStrings.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/UnsafeByteStrings.java
rename to java/src/main/java/com/google/protobuf/UnsafeByteStrings.java
diff --git a/java/core/src/main/java/com/google/protobuf/Utf8.java b/java/src/main/java/com/google/protobuf/Utf8.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/Utf8.java
rename to java/src/main/java/com/google/protobuf/Utf8.java
diff --git a/java/core/src/main/java/com/google/protobuf/WireFormat.java b/java/src/main/java/com/google/protobuf/WireFormat.java
similarity index 100%
rename from java/core/src/main/java/com/google/protobuf/WireFormat.java
rename to java/src/main/java/com/google/protobuf/WireFormat.java
diff --git a/java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java b/java/src/test/java/com/google/protobuf/AbstractMessageTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/AbstractMessageTest.java
rename to java/src/test/java/com/google/protobuf/AbstractMessageTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/AnyTest.java b/java/src/test/java/com/google/protobuf/AnyTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/AnyTest.java
rename to java/src/test/java/com/google/protobuf/AnyTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java b/java/src/test/java/com/google/protobuf/BooleanArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/BooleanArrayListTest.java
rename to java/src/test/java/com/google/protobuf/BooleanArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java b/java/src/test/java/com/google/protobuf/BoundedByteStringTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/BoundedByteStringTest.java
rename to java/src/test/java/com/google/protobuf/BoundedByteStringTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/ByteStringTest.java b/java/src/test/java/com/google/protobuf/ByteStringTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/ByteStringTest.java
rename to java/src/test/java/com/google/protobuf/ByteStringTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java b/java/src/test/java/com/google/protobuf/CheckUtf8Test.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/CheckUtf8Test.java
rename to java/src/test/java/com/google/protobuf/CheckUtf8Test.java
diff --git a/java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java b/java/src/test/java/com/google/protobuf/CodedInputStreamTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/CodedInputStreamTest.java
rename to java/src/test/java/com/google/protobuf/CodedInputStreamTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java b/java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
rename to java/src/test/java/com/google/protobuf/CodedOutputStreamTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java b/java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
rename to java/src/test/java/com/google/protobuf/DeprecatedFieldTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/DescriptorsTest.java b/java/src/test/java/com/google/protobuf/DescriptorsTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/DescriptorsTest.java
rename to java/src/test/java/com/google/protobuf/DescriptorsTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java b/java/src/test/java/com/google/protobuf/DoubleArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/DoubleArrayListTest.java
rename to java/src/test/java/com/google/protobuf/DoubleArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java b/java/src/test/java/com/google/protobuf/DynamicMessageTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/DynamicMessageTest.java
rename to java/src/test/java/com/google/protobuf/DynamicMessageTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java b/java/src/test/java/com/google/protobuf/FieldPresenceTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/FieldPresenceTest.java
rename to java/src/test/java/com/google/protobuf/FieldPresenceTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java b/java/src/test/java/com/google/protobuf/FloatArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/FloatArrayListTest.java
rename to java/src/test/java/com/google/protobuf/FloatArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java b/java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
rename to java/src/test/java/com/google/protobuf/ForceFieldBuildersPreRun.java
diff --git a/java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java b/java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/GeneratedMessageTest.java
rename to java/src/test/java/com/google/protobuf/GeneratedMessageTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/IntArrayListTest.java b/java/src/test/java/com/google/protobuf/IntArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/IntArrayListTest.java
rename to java/src/test/java/com/google/protobuf/IntArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java b/java/src/test/java/com/google/protobuf/IsValidUtf8Test.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/IsValidUtf8Test.java
rename to java/src/test/java/com/google/protobuf/IsValidUtf8Test.java
diff --git a/java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java b/java/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
rename to java/src/test/java/com/google/protobuf/IsValidUtf8TestUtil.java
diff --git a/java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java b/java/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
rename to java/src/test/java/com/google/protobuf/LazyFieldLiteTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LazyFieldTest.java b/java/src/test/java/com/google/protobuf/LazyFieldTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LazyFieldTest.java
rename to java/src/test/java/com/google/protobuf/LazyFieldTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java b/java/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
rename to java/src/test/java/com/google/protobuf/LazyMessageLiteTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java b/java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
rename to java/src/test/java/com/google/protobuf/LazyStringArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java b/java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
rename to java/src/test/java/com/google/protobuf/LazyStringEndToEndTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java b/java/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
rename to java/src/test/java/com/google/protobuf/LiteEqualsAndHashTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LiteTest.java b/java/src/test/java/com/google/protobuf/LiteTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LiteTest.java
rename to java/src/test/java/com/google/protobuf/LiteTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java b/java/src/test/java/com/google/protobuf/LiteralByteStringTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LiteralByteStringTest.java
rename to java/src/test/java/com/google/protobuf/LiteralByteStringTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/LongArrayListTest.java b/java/src/test/java/com/google/protobuf/LongArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/LongArrayListTest.java
rename to java/src/test/java/com/google/protobuf/LongArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java b/java/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
rename to java/src/test/java/com/google/protobuf/MapForProto2LiteTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/MapForProto2Test.java b/java/src/test/java/com/google/protobuf/MapForProto2Test.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/MapForProto2Test.java
rename to java/src/test/java/com/google/protobuf/MapForProto2Test.java
diff --git a/java/core/src/test/java/com/google/protobuf/MapTest.java b/java/src/test/java/com/google/protobuf/MapTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/MapTest.java
rename to java/src/test/java/com/google/protobuf/MapTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/MessageTest.java b/java/src/test/java/com/google/protobuf/MessageTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/MessageTest.java
rename to java/src/test/java/com/google/protobuf/MessageTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java b/java/src/test/java/com/google/protobuf/NestedBuildersTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/NestedBuildersTest.java
rename to java/src/test/java/com/google/protobuf/NestedBuildersTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/NioByteStringTest.java b/java/src/test/java/com/google/protobuf/NioByteStringTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/NioByteStringTest.java
rename to java/src/test/java/com/google/protobuf/NioByteStringTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java b/java/src/test/java/com/google/protobuf/ParseExceptionsTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/ParseExceptionsTest.java
rename to java/src/test/java/com/google/protobuf/ParseExceptionsTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/ParserTest.java b/java/src/test/java/com/google/protobuf/ParserTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/ParserTest.java
rename to java/src/test/java/com/google/protobuf/ParserTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java b/java/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
rename to java/src/test/java/com/google/protobuf/ProtobufArrayListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java b/java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
rename to java/src/test/java/com/google/protobuf/RepeatedFieldBuilderTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java b/java/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
rename to java/src/test/java/com/google/protobuf/RopeByteStringSubstringTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java b/java/src/test/java/com/google/protobuf/RopeByteStringTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/RopeByteStringTest.java
rename to java/src/test/java/com/google/protobuf/RopeByteStringTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/ServiceTest.java b/java/src/test/java/com/google/protobuf/ServiceTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/ServiceTest.java
rename to java/src/test/java/com/google/protobuf/ServiceTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java b/java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
rename to java/src/test/java/com/google/protobuf/SingleFieldBuilderTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java b/java/src/test/java/com/google/protobuf/SmallSortedMapTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/SmallSortedMapTest.java
rename to java/src/test/java/com/google/protobuf/SmallSortedMapTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java b/java/src/test/java/com/google/protobuf/TestBadIdentifiers.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/TestBadIdentifiers.java
rename to java/src/test/java/com/google/protobuf/TestBadIdentifiers.java
diff --git a/java/core/src/test/java/com/google/protobuf/TestUtil.java b/java/src/test/java/com/google/protobuf/TestUtil.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/TestUtil.java
rename to java/src/test/java/com/google/protobuf/TestUtil.java
diff --git a/java/core/src/test/java/com/google/protobuf/TextFormatTest.java b/java/src/test/java/com/google/protobuf/TextFormatTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/TextFormatTest.java
rename to java/src/test/java/com/google/protobuf/TextFormatTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java b/java/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
rename to java/src/test/java/com/google/protobuf/UnknownEnumValueTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java b/java/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
rename to java/src/test/java/com/google/protobuf/UnknownFieldSetLiteTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java b/java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
rename to java/src/test/java/com/google/protobuf/UnknownFieldSetTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java b/java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
rename to java/src/test/java/com/google/protobuf/UnmodifiableLazyStringListTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java b/java/src/test/java/com/google/protobuf/WellKnownTypesTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/WellKnownTypesTest.java
rename to java/src/test/java/com/google/protobuf/WellKnownTypesTest.java
diff --git a/java/core/src/test/java/com/google/protobuf/WireFormatTest.java b/java/src/test/java/com/google/protobuf/WireFormatTest.java
similarity index 100%
rename from java/core/src/test/java/com/google/protobuf/WireFormatTest.java
rename to java/src/test/java/com/google/protobuf/WireFormatTest.java
diff --git a/java/core/src/test/proto/com/google/protobuf/any_test.proto b/java/src/test/java/com/google/protobuf/any_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/any_test.proto
rename to java/src/test/java/com/google/protobuf/any_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/field_presence_test.proto b/java/src/test/java/com/google/protobuf/field_presence_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/field_presence_test.proto
rename to java/src/test/java/com/google/protobuf/field_presence_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto b/java/src/test/java/com/google/protobuf/lazy_fields_lite.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/lazy_fields_lite.proto
rename to java/src/test/java/com/google/protobuf/lazy_fields_lite.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto b/java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/lite_equals_and_hash.proto
rename to java/src/test/java/com/google/protobuf/lite_equals_and_hash.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto b/java/src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/map_for_proto2_lite_test.proto
rename to java/src/test/java/com/google/protobuf/map_for_proto2_lite_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto b/java/src/test/java/com/google/protobuf/map_for_proto2_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/map_for_proto2_test.proto
rename to java/src/test/java/com/google/protobuf/map_for_proto2_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto b/java/src/test/java/com/google/protobuf/map_initialization_order_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/map_initialization_order_test.proto
rename to java/src/test/java/com/google/protobuf/map_initialization_order_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/map_test.proto b/java/src/test/java/com/google/protobuf/map_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/map_test.proto
rename to java/src/test/java/com/google/protobuf/map_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto b/java/src/test/java/com/google/protobuf/multiple_files_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/multiple_files_test.proto
rename to java/src/test/java/com/google/protobuf/multiple_files_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto b/java/src/test/java/com/google/protobuf/nested_builders_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/nested_builders_test.proto
rename to java/src/test/java/com/google/protobuf/nested_builders_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/nested_extension.proto b/java/src/test/java/com/google/protobuf/nested_extension.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/nested_extension.proto
rename to java/src/test/java/com/google/protobuf/nested_extension.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto b/java/src/test/java/com/google/protobuf/nested_extension_lite.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/nested_extension_lite.proto
rename to java/src/test/java/com/google/protobuf/nested_extension_lite.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/non_nested_extension.proto b/java/src/test/java/com/google/protobuf/non_nested_extension.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/non_nested_extension.proto
rename to java/src/test/java/com/google/protobuf/non_nested_extension.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto b/java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/non_nested_extension_lite.proto
rename to java/src/test/java/com/google/protobuf/non_nested_extension_lite.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto b/java/src/test/java/com/google/protobuf/outer_class_name_test.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/outer_class_name_test.proto
rename to java/src/test/java/com/google/protobuf/outer_class_name_test.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto b/java/src/test/java/com/google/protobuf/outer_class_name_test2.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/outer_class_name_test2.proto
rename to java/src/test/java/com/google/protobuf/outer_class_name_test2.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto b/java/src/test/java/com/google/protobuf/outer_class_name_test3.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/outer_class_name_test3.proto
rename to java/src/test/java/com/google/protobuf/outer_class_name_test3.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto b/java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/test_bad_identifiers.proto
rename to java/src/test/java/com/google/protobuf/test_bad_identifiers.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto b/java/src/test/java/com/google/protobuf/test_check_utf8.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/test_check_utf8.proto
rename to java/src/test/java/com/google/protobuf/test_check_utf8.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto b/java/src/test/java/com/google/protobuf/test_check_utf8_size.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/test_check_utf8_size.proto
rename to java/src/test/java/com/google/protobuf/test_check_utf8_size.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/test_custom_options.proto b/java/src/test/java/com/google/protobuf/test_custom_options.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/test_custom_options.proto
rename to java/src/test/java/com/google/protobuf/test_custom_options.proto
diff --git a/java/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto b/java/src/test/java/com/google/protobuf/test_extra_interfaces.proto
similarity index 100%
rename from java/core/src/test/proto/com/google/protobuf/test_extra_interfaces.proto
rename to java/src/test/java/com/google/protobuf/test_extra_interfaces.proto
diff --git a/java/util/src/test/proto/com/google/protobuf/util/json_test.proto b/java/util/src/test/java/com/google/protobuf/util/json_test.proto
similarity index 100%
rename from java/util/src/test/proto/com/google/protobuf/util/json_test.proto
rename to java/util/src/test/java/com/google/protobuf/util/json_test.proto