diff --git a/lib/java/Makefile.am b/lib/java/Makefile.am
index 5f97680..42514f4 100644
--- a/lib/java/Makefile.am
+++ b/lib/java/Makefile.am
@@ -65,6 +65,5 @@
 	coding_standards.md \
 	android \
 	src \
-	test \
 	code_quality_tools \
 	README.md
diff --git a/lib/java/build.gradle b/lib/java/build.gradle
index ad30249..6bd2ec4 100644
--- a/lib/java/build.gradle
+++ b/lib/java/build.gradle
@@ -36,7 +36,7 @@
 }
 
 plugins {
-    id 'java'
+    id 'java-library'
     id 'maven'
     id 'signing'
     id 'com.github.johnrengelman.shadow' version '4.0.4'
diff --git a/lib/java/gradle/functionalTests.gradle b/lib/java/gradle/functionalTests.gradle
index f197520..15737f5 100644
--- a/lib/java/gradle/functionalTests.gradle
+++ b/lib/java/gradle/functionalTests.gradle
@@ -30,11 +30,6 @@
 sourceSets {
     crossTest {
         java {
-            srcDir 'test'
-            include '**/test/TestClient.java'
-            include '**/test/TestServer.java'
-            include '**/test/TestNonblockingServer.java'
-            include '**/test/TestTServletServer.java'
         }
     }
 }
@@ -90,9 +85,9 @@
 // The Java executable to use with the runner scripts
 def javaExe = file("${System.getProperty('java.home')}/bin/java${execExt}").canonicalPath
 // The common Uber jar path
-def jarPath = shadowJar.archivePath.canonicalPath
-def trustStore = file('test/resources/.truststore').canonicalPath
-def keyStore = file('test/resources/.keystore').canonicalPath
+def jarPath = shadowJar.archiveFile.get().asFile.canonicalPath
+def trustStore = file("${projectDir}/src/crossTest/resources/.truststore").canonicalPath
+def keyStore = file("${projectDir}/src/crossTest/resources/.keystore").canonicalPath
 
 task generateRunnerScriptForClient(group: 'Build') {
     description = 'Generate a runner script for cross-check tests with TestClient'
diff --git a/lib/java/gradle/generateTestThrift.gradle b/lib/java/gradle/generateTestThrift.gradle
index c48845e..b8a963d 100644
--- a/lib/java/gradle/generateTestThrift.gradle
+++ b/lib/java/gradle/generateTestThrift.gradle
@@ -39,7 +39,7 @@
 ext.thriftCompile = { Task task, String thriftFileName, String generator = 'java', File outputDir = genSrc ->
     def thriftFile = file("$thriftRoot/test/$thriftFileName")
     if (!thriftFile.exists()) {
-        thriftFile = file("$projectDir/test/resources/$thriftFileName")
+        thriftFile = file("$projectDir/src/test/resources/$thriftFileName")
         assert thriftFile.exists(), "can't find $thriftFile"
     }
 
diff --git a/lib/java/gradle/sourceConfiguration.gradle b/lib/java/gradle/sourceConfiguration.gradle
index b45fdc8..827e926 100644
--- a/lib/java/gradle/sourceConfiguration.gradle
+++ b/lib/java/gradle/sourceConfiguration.gradle
@@ -18,31 +18,6 @@
  */
 
 // Following Gradle best practices to keep build logic organized
-
-// ----------------------------------------------------------------------------
-// source sets for main and test sources
-sourceSets {
-    main {
-        java {
-            srcDir 'src'
-        }
-    }
-    test {
-        java {
-            srcDir 'test'
-            // see functionalTests.gradle for these files
-            exclude '**/test/TestClient.java'
-            exclude '**/test/TestServer.java'
-            exclude '**/test/TestNonblockingServer.java'
-            exclude '**/test/TestTServletServer.java'
-        }
-        resources {
-            srcDir 'test/resources'
-            include 'log4j.properties'
-        }
-    }
-}
-
 // ----------------------------------------------------------------------------
 // Compiler configuration details
 
diff --git a/lib/java/gradle/unitTests.gradle b/lib/java/gradle/unitTests.gradle
index 2bf1c03..10a5539 100644
--- a/lib/java/gradle/unitTests.gradle
+++ b/lib/java/gradle/unitTests.gradle
@@ -74,9 +74,9 @@
     systemProperties = [
         'build.test': "${compileTestJava.destinationDir}",
         'test.port': "${testPort}",
-        'javax.net.ssl.trustStore': "${projectDir}/test/resources/.truststore",
+        'javax.net.ssl.trustStore': "${projectDir}/src/crossTest/resources/.truststore",
         'javax.net.ssl.trustStorePassword': 'thrift',
-        'javax.net.ssl.keyStore': "${projectDir}/test/resources/.keystore",
+        'javax.net.ssl.keyStore': "${projectDir}/src/crossTest/resources/.keystore",
         'javax.net.ssl.keyStorePassword': 'thrift'
     ]
 }
diff --git a/lib/java/test/org/apache/thrift/test/TestClient.java b/lib/java/src/crossTest/java/org/apache/thrift/test/TestClient.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/TestClient.java
rename to lib/java/src/crossTest/java/org/apache/thrift/test/TestClient.java
diff --git a/lib/java/test/org/apache/thrift/test/TestNonblockingServer.java b/lib/java/src/crossTest/java/org/apache/thrift/test/TestNonblockingServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/TestNonblockingServer.java
rename to lib/java/src/crossTest/java/org/apache/thrift/test/TestNonblockingServer.java
diff --git a/lib/java/test/org/apache/thrift/test/TestServer.java b/lib/java/src/crossTest/java/org/apache/thrift/test/TestServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/TestServer.java
rename to lib/java/src/crossTest/java/org/apache/thrift/test/TestServer.java
diff --git a/lib/java/test/org/apache/thrift/test/TestTServletServer.java b/lib/java/src/crossTest/java/org/apache/thrift/test/TestTServletServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/TestTServletServer.java
rename to lib/java/src/crossTest/java/org/apache/thrift/test/TestTServletServer.java
diff --git a/lib/java/test/resources/.keystore b/lib/java/src/crossTest/resources/.keystore
similarity index 100%
rename from lib/java/test/resources/.keystore
rename to lib/java/src/crossTest/resources/.keystore
Binary files differ
diff --git a/lib/java/test/resources/.truststore b/lib/java/src/crossTest/resources/.truststore
similarity index 100%
rename from lib/java/test/resources/.truststore
rename to lib/java/src/crossTest/resources/.truststore
Binary files differ
diff --git a/lib/java/src/org/apache/thrift/AsyncProcessFunction.java b/lib/java/src/main/java/org/apache/thrift/AsyncProcessFunction.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/AsyncProcessFunction.java
rename to lib/java/src/main/java/org/apache/thrift/AsyncProcessFunction.java
diff --git a/lib/java/src/org/apache/thrift/EncodingUtils.java b/lib/java/src/main/java/org/apache/thrift/EncodingUtils.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/EncodingUtils.java
rename to lib/java/src/main/java/org/apache/thrift/EncodingUtils.java
diff --git a/lib/java/src/org/apache/thrift/Option.java b/lib/java/src/main/java/org/apache/thrift/Option.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/Option.java
rename to lib/java/src/main/java/org/apache/thrift/Option.java
diff --git a/lib/java/src/org/apache/thrift/ProcessFunction.java b/lib/java/src/main/java/org/apache/thrift/ProcessFunction.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/ProcessFunction.java
rename to lib/java/src/main/java/org/apache/thrift/ProcessFunction.java
diff --git a/lib/java/src/org/apache/thrift/TApplicationException.java b/lib/java/src/main/java/org/apache/thrift/TApplicationException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TApplicationException.java
rename to lib/java/src/main/java/org/apache/thrift/TApplicationException.java
diff --git a/lib/java/src/org/apache/thrift/TAsyncProcessor.java b/lib/java/src/main/java/org/apache/thrift/TAsyncProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TAsyncProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/TAsyncProcessor.java
diff --git a/lib/java/src/org/apache/thrift/TBase.java b/lib/java/src/main/java/org/apache/thrift/TBase.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TBase.java
rename to lib/java/src/main/java/org/apache/thrift/TBase.java
diff --git a/lib/java/src/org/apache/thrift/TBaseAsyncProcessor.java b/lib/java/src/main/java/org/apache/thrift/TBaseAsyncProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TBaseAsyncProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/TBaseAsyncProcessor.java
diff --git a/lib/java/src/org/apache/thrift/TBaseHelper.java b/lib/java/src/main/java/org/apache/thrift/TBaseHelper.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TBaseHelper.java
rename to lib/java/src/main/java/org/apache/thrift/TBaseHelper.java
diff --git a/lib/java/src/org/apache/thrift/TBaseProcessor.java b/lib/java/src/main/java/org/apache/thrift/TBaseProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TBaseProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/TBaseProcessor.java
diff --git a/lib/java/src/org/apache/thrift/TByteArrayOutputStream.java b/lib/java/src/main/java/org/apache/thrift/TByteArrayOutputStream.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TByteArrayOutputStream.java
rename to lib/java/src/main/java/org/apache/thrift/TByteArrayOutputStream.java
diff --git a/lib/java/src/org/apache/thrift/TConfiguration.java b/lib/java/src/main/java/org/apache/thrift/TConfiguration.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TConfiguration.java
rename to lib/java/src/main/java/org/apache/thrift/TConfiguration.java
diff --git a/lib/java/src/org/apache/thrift/TDeserializer.java b/lib/java/src/main/java/org/apache/thrift/TDeserializer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TDeserializer.java
rename to lib/java/src/main/java/org/apache/thrift/TDeserializer.java
diff --git a/lib/java/src/org/apache/thrift/TEnum.java b/lib/java/src/main/java/org/apache/thrift/TEnum.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TEnum.java
rename to lib/java/src/main/java/org/apache/thrift/TEnum.java
diff --git a/lib/java/src/org/apache/thrift/TEnumHelper.java b/lib/java/src/main/java/org/apache/thrift/TEnumHelper.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TEnumHelper.java
rename to lib/java/src/main/java/org/apache/thrift/TEnumHelper.java
diff --git a/lib/java/src/org/apache/thrift/TException.java b/lib/java/src/main/java/org/apache/thrift/TException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TException.java
rename to lib/java/src/main/java/org/apache/thrift/TException.java
diff --git a/lib/java/src/org/apache/thrift/TFieldIdEnum.java b/lib/java/src/main/java/org/apache/thrift/TFieldIdEnum.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TFieldIdEnum.java
rename to lib/java/src/main/java/org/apache/thrift/TFieldIdEnum.java
diff --git a/lib/java/src/org/apache/thrift/TFieldRequirementType.java b/lib/java/src/main/java/org/apache/thrift/TFieldRequirementType.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TFieldRequirementType.java
rename to lib/java/src/main/java/org/apache/thrift/TFieldRequirementType.java
diff --git a/lib/java/src/org/apache/thrift/TMultiplexedProcessor.java b/lib/java/src/main/java/org/apache/thrift/TMultiplexedProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TMultiplexedProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/TMultiplexedProcessor.java
diff --git a/lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java b/lib/java/src/main/java/org/apache/thrift/TNonblockingMultiFetchClient.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TNonblockingMultiFetchClient.java
rename to lib/java/src/main/java/org/apache/thrift/TNonblockingMultiFetchClient.java
diff --git a/lib/java/src/org/apache/thrift/TNonblockingMultiFetchStats.java b/lib/java/src/main/java/org/apache/thrift/TNonblockingMultiFetchStats.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TNonblockingMultiFetchStats.java
rename to lib/java/src/main/java/org/apache/thrift/TNonblockingMultiFetchStats.java
diff --git a/lib/java/src/org/apache/thrift/TProcessor.java b/lib/java/src/main/java/org/apache/thrift/TProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/TProcessor.java
diff --git a/lib/java/src/org/apache/thrift/TProcessorFactory.java b/lib/java/src/main/java/org/apache/thrift/TProcessorFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TProcessorFactory.java
rename to lib/java/src/main/java/org/apache/thrift/TProcessorFactory.java
diff --git a/lib/java/src/org/apache/thrift/TSerializable.java b/lib/java/src/main/java/org/apache/thrift/TSerializable.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TSerializable.java
rename to lib/java/src/main/java/org/apache/thrift/TSerializable.java
diff --git a/lib/java/src/org/apache/thrift/TSerializer.java b/lib/java/src/main/java/org/apache/thrift/TSerializer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TSerializer.java
rename to lib/java/src/main/java/org/apache/thrift/TSerializer.java
diff --git a/lib/java/src/org/apache/thrift/TServiceClient.java b/lib/java/src/main/java/org/apache/thrift/TServiceClient.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TServiceClient.java
rename to lib/java/src/main/java/org/apache/thrift/TServiceClient.java
diff --git a/lib/java/src/org/apache/thrift/TServiceClientFactory.java b/lib/java/src/main/java/org/apache/thrift/TServiceClientFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TServiceClientFactory.java
rename to lib/java/src/main/java/org/apache/thrift/TServiceClientFactory.java
diff --git a/lib/java/src/org/apache/thrift/TUnion.java b/lib/java/src/main/java/org/apache/thrift/TUnion.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/TUnion.java
rename to lib/java/src/main/java/org/apache/thrift/TUnion.java
diff --git a/lib/java/src/org/apache/thrift/annotation/Nullable.java b/lib/java/src/main/java/org/apache/thrift/annotation/Nullable.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/annotation/Nullable.java
rename to lib/java/src/main/java/org/apache/thrift/annotation/Nullable.java
diff --git a/lib/java/src/org/apache/thrift/async/AsyncMethodCallback.java b/lib/java/src/main/java/org/apache/thrift/async/AsyncMethodCallback.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/async/AsyncMethodCallback.java
rename to lib/java/src/main/java/org/apache/thrift/async/AsyncMethodCallback.java
diff --git a/lib/java/src/org/apache/thrift/async/AsyncMethodFutureAdapter.java b/lib/java/src/main/java/org/apache/thrift/async/AsyncMethodFutureAdapter.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/async/AsyncMethodFutureAdapter.java
rename to lib/java/src/main/java/org/apache/thrift/async/AsyncMethodFutureAdapter.java
diff --git a/lib/java/src/org/apache/thrift/async/TAsyncClient.java b/lib/java/src/main/java/org/apache/thrift/async/TAsyncClient.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/async/TAsyncClient.java
rename to lib/java/src/main/java/org/apache/thrift/async/TAsyncClient.java
diff --git a/lib/java/src/org/apache/thrift/async/TAsyncClientFactory.java b/lib/java/src/main/java/org/apache/thrift/async/TAsyncClientFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/async/TAsyncClientFactory.java
rename to lib/java/src/main/java/org/apache/thrift/async/TAsyncClientFactory.java
diff --git a/lib/java/src/org/apache/thrift/async/TAsyncClientManager.java b/lib/java/src/main/java/org/apache/thrift/async/TAsyncClientManager.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/async/TAsyncClientManager.java
rename to lib/java/src/main/java/org/apache/thrift/async/TAsyncClientManager.java
diff --git a/lib/java/src/org/apache/thrift/async/TAsyncMethodCall.java b/lib/java/src/main/java/org/apache/thrift/async/TAsyncMethodCall.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/async/TAsyncMethodCall.java
rename to lib/java/src/main/java/org/apache/thrift/async/TAsyncMethodCall.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/EnumMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/EnumMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/EnumMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/EnumMetaData.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/FieldMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/FieldMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/FieldMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/FieldMetaData.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/FieldValueMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/FieldValueMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/FieldValueMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/FieldValueMetaData.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/ListMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/ListMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/ListMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/ListMetaData.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/MapMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/MapMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/MapMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/MapMetaData.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/SetMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/SetMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/SetMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/SetMetaData.java
diff --git a/lib/java/src/org/apache/thrift/meta_data/StructMetaData.java b/lib/java/src/main/java/org/apache/thrift/meta_data/StructMetaData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/meta_data/StructMetaData.java
rename to lib/java/src/main/java/org/apache/thrift/meta_data/StructMetaData.java
diff --git a/lib/java/src/org/apache/thrift/partial/EnumCache.java b/lib/java/src/main/java/org/apache/thrift/partial/EnumCache.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/EnumCache.java
rename to lib/java/src/main/java/org/apache/thrift/partial/EnumCache.java
diff --git a/lib/java/src/org/apache/thrift/partial/PartialThriftComparer.java b/lib/java/src/main/java/org/apache/thrift/partial/PartialThriftComparer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/PartialThriftComparer.java
rename to lib/java/src/main/java/org/apache/thrift/partial/PartialThriftComparer.java
diff --git a/lib/java/src/org/apache/thrift/partial/README.md b/lib/java/src/main/java/org/apache/thrift/partial/README.md
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/README.md
rename to lib/java/src/main/java/org/apache/thrift/partial/README.md
diff --git a/lib/java/src/org/apache/thrift/partial/TFieldData.java b/lib/java/src/main/java/org/apache/thrift/partial/TFieldData.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/TFieldData.java
rename to lib/java/src/main/java/org/apache/thrift/partial/TFieldData.java
diff --git a/lib/java/src/org/apache/thrift/partial/ThriftField.java b/lib/java/src/main/java/org/apache/thrift/partial/ThriftField.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/ThriftField.java
rename to lib/java/src/main/java/org/apache/thrift/partial/ThriftField.java
diff --git a/lib/java/src/org/apache/thrift/partial/ThriftFieldValueProcessor.java b/lib/java/src/main/java/org/apache/thrift/partial/ThriftFieldValueProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/ThriftFieldValueProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/partial/ThriftFieldValueProcessor.java
diff --git a/lib/java/src/org/apache/thrift/partial/ThriftMetadata.java b/lib/java/src/main/java/org/apache/thrift/partial/ThriftMetadata.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/ThriftMetadata.java
rename to lib/java/src/main/java/org/apache/thrift/partial/ThriftMetadata.java
diff --git a/lib/java/src/org/apache/thrift/partial/ThriftStructProcessor.java b/lib/java/src/main/java/org/apache/thrift/partial/ThriftStructProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/ThriftStructProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/partial/ThriftStructProcessor.java
diff --git a/lib/java/src/org/apache/thrift/partial/Validate.java b/lib/java/src/main/java/org/apache/thrift/partial/Validate.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/partial/Validate.java
rename to lib/java/src/main/java/org/apache/thrift/partial/Validate.java
diff --git a/lib/java/src/org/apache/thrift/protocol/ShortStack.java b/lib/java/src/main/java/org/apache/thrift/protocol/ShortStack.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/ShortStack.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/ShortStack.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TBase64Utils.java b/lib/java/src/main/java/org/apache/thrift/protocol/TBase64Utils.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TBase64Utils.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TBase64Utils.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TBinaryProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TBinaryProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TBinaryProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TCompactProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TCompactProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TCompactProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TCompactProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TField.java b/lib/java/src/main/java/org/apache/thrift/protocol/TField.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TField.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TField.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TJSONProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TJSONProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TJSONProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TList.java b/lib/java/src/main/java/org/apache/thrift/protocol/TList.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TList.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TList.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TMap.java b/lib/java/src/main/java/org/apache/thrift/protocol/TMap.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TMap.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TMap.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TMessage.java b/lib/java/src/main/java/org/apache/thrift/protocol/TMessage.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TMessage.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TMessage.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TMessageType.java b/lib/java/src/main/java/org/apache/thrift/protocol/TMessageType.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TMessageType.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TMessageType.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TMultiplexedProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TMultiplexedProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TMultiplexedProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TMultiplexedProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolDecorator.java b/lib/java/src/main/java/org/apache/thrift/protocol/TProtocolDecorator.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TProtocolDecorator.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TProtocolDecorator.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolException.java b/lib/java/src/main/java/org/apache/thrift/protocol/TProtocolException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TProtocolException.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TProtocolException.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java b/lib/java/src/main/java/org/apache/thrift/protocol/TProtocolFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TProtocolFactory.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TProtocolFactory.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java b/lib/java/src/main/java/org/apache/thrift/protocol/TProtocolUtil.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TProtocolUtil.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TProtocolUtil.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TSet.java b/lib/java/src/main/java/org/apache/thrift/protocol/TSet.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TSet.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TSet.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TSimpleJSONProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TSimpleJSONProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TSimpleJSONProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TStruct.java b/lib/java/src/main/java/org/apache/thrift/protocol/TStruct.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TStruct.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TStruct.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TTupleProtocol.java b/lib/java/src/main/java/org/apache/thrift/protocol/TTupleProtocol.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TTupleProtocol.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TTupleProtocol.java
diff --git a/lib/java/src/org/apache/thrift/protocol/TType.java b/lib/java/src/main/java/org/apache/thrift/protocol/TType.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/protocol/TType.java
rename to lib/java/src/main/java/org/apache/thrift/protocol/TType.java
diff --git a/lib/java/src/org/apache/thrift/scheme/IScheme.java b/lib/java/src/main/java/org/apache/thrift/scheme/IScheme.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/scheme/IScheme.java
rename to lib/java/src/main/java/org/apache/thrift/scheme/IScheme.java
diff --git a/lib/java/src/org/apache/thrift/scheme/SchemeFactory.java b/lib/java/src/main/java/org/apache/thrift/scheme/SchemeFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/scheme/SchemeFactory.java
rename to lib/java/src/main/java/org/apache/thrift/scheme/SchemeFactory.java
diff --git a/lib/java/src/org/apache/thrift/scheme/StandardScheme.java b/lib/java/src/main/java/org/apache/thrift/scheme/StandardScheme.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/scheme/StandardScheme.java
rename to lib/java/src/main/java/org/apache/thrift/scheme/StandardScheme.java
diff --git a/lib/java/src/org/apache/thrift/scheme/TupleScheme.java b/lib/java/src/main/java/org/apache/thrift/scheme/TupleScheme.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/scheme/TupleScheme.java
rename to lib/java/src/main/java/org/apache/thrift/scheme/TupleScheme.java
diff --git a/lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java b/lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/AbstractNonblockingServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/AbstractNonblockingServer.java
diff --git a/lib/java/src/org/apache/thrift/server/Invocation.java b/lib/java/src/main/java/org/apache/thrift/server/Invocation.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/Invocation.java
rename to lib/java/src/main/java/org/apache/thrift/server/Invocation.java
diff --git a/lib/java/src/org/apache/thrift/server/ServerContext.java b/lib/java/src/main/java/org/apache/thrift/server/ServerContext.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/ServerContext.java
rename to lib/java/src/main/java/org/apache/thrift/server/ServerContext.java
diff --git a/lib/java/src/org/apache/thrift/server/TExtensibleServlet.java b/lib/java/src/main/java/org/apache/thrift/server/TExtensibleServlet.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TExtensibleServlet.java
rename to lib/java/src/main/java/org/apache/thrift/server/TExtensibleServlet.java
diff --git a/lib/java/src/org/apache/thrift/server/THsHaServer.java b/lib/java/src/main/java/org/apache/thrift/server/THsHaServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/THsHaServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/THsHaServer.java
diff --git a/lib/java/src/org/apache/thrift/server/TNonblockingServer.java b/lib/java/src/main/java/org/apache/thrift/server/TNonblockingServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TNonblockingServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/TNonblockingServer.java
diff --git a/lib/java/src/org/apache/thrift/server/TSaslNonblockingServer.java b/lib/java/src/main/java/org/apache/thrift/server/TSaslNonblockingServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TSaslNonblockingServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/TSaslNonblockingServer.java
diff --git a/lib/java/src/org/apache/thrift/server/TServer.java b/lib/java/src/main/java/org/apache/thrift/server/TServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/TServer.java
diff --git a/lib/java/src/org/apache/thrift/server/TServerEventHandler.java b/lib/java/src/main/java/org/apache/thrift/server/TServerEventHandler.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TServerEventHandler.java
rename to lib/java/src/main/java/org/apache/thrift/server/TServerEventHandler.java
diff --git a/lib/java/src/org/apache/thrift/server/TServlet.java b/lib/java/src/main/java/org/apache/thrift/server/TServlet.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TServlet.java
rename to lib/java/src/main/java/org/apache/thrift/server/TServlet.java
diff --git a/lib/java/src/org/apache/thrift/server/TSimpleServer.java b/lib/java/src/main/java/org/apache/thrift/server/TSimpleServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TSimpleServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/TSimpleServer.java
diff --git a/lib/java/src/org/apache/thrift/server/TThreadPoolServer.java b/lib/java/src/main/java/org/apache/thrift/server/TThreadPoolServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TThreadPoolServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/TThreadPoolServer.java
diff --git a/lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java b/lib/java/src/main/java/org/apache/thrift/server/TThreadedSelectorServer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/server/TThreadedSelectorServer.java
rename to lib/java/src/main/java/org/apache/thrift/server/TThreadedSelectorServer.java
diff --git a/lib/java/src/org/apache/thrift/transport/AutoExpandingBuffer.java b/lib/java/src/main/java/org/apache/thrift/transport/AutoExpandingBuffer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/AutoExpandingBuffer.java
rename to lib/java/src/main/java/org/apache/thrift/transport/AutoExpandingBuffer.java
diff --git a/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/AutoExpandingBufferReadTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/AutoExpandingBufferWriteTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TByteBuffer.java b/lib/java/src/main/java/org/apache/thrift/transport/TByteBuffer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TByteBuffer.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TByteBuffer.java
diff --git a/lib/java/src/org/apache/thrift/transport/TEOFException.java b/lib/java/src/main/java/org/apache/thrift/transport/TEOFException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TEOFException.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TEOFException.java
diff --git a/lib/java/src/org/apache/thrift/transport/TEndpointTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TEndpointTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TEndpointTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TEndpointTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TFileProcessor.java b/lib/java/src/main/java/org/apache/thrift/transport/TFileProcessor.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TFileProcessor.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TFileProcessor.java
diff --git a/lib/java/src/org/apache/thrift/transport/TFileTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TFileTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TFileTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TFileTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/THttpClient.java b/lib/java/src/main/java/org/apache/thrift/transport/THttpClient.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/THttpClient.java
rename to lib/java/src/main/java/org/apache/thrift/transport/THttpClient.java
diff --git a/lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TIOStreamTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TIOStreamTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TIOStreamTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java b/lib/java/src/main/java/org/apache/thrift/transport/TMemoryBuffer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TMemoryBuffer.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TMemoryBuffer.java
diff --git a/lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TMemoryInputTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TMemoryInputTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TMemoryInputTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TMemoryTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TMemoryTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TMemoryTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TMemoryTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java b/lib/java/src/main/java/org/apache/thrift/transport/TNonblockingServerSocket.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TNonblockingServerSocket.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TNonblockingServerSocket.java
diff --git a/lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TNonblockingServerTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TNonblockingServerTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TNonblockingServerTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java b/lib/java/src/main/java/org/apache/thrift/transport/TNonblockingSocket.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TNonblockingSocket.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TNonblockingSocket.java
diff --git a/lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TNonblockingTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TNonblockingTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TNonblockingTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java b/lib/java/src/main/java/org/apache/thrift/transport/TSSLTransportFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSSLTransportFactory.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSSLTransportFactory.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TSaslClientTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSaslClientTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSaslClientTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSaslServerTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TSaslServerTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSaslServerTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSaslServerTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSaslTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TSaslTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSaslTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSaslTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSeekableFile.java b/lib/java/src/main/java/org/apache/thrift/transport/TSeekableFile.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSeekableFile.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSeekableFile.java
diff --git a/lib/java/src/org/apache/thrift/transport/TServerSocket.java b/lib/java/src/main/java/org/apache/thrift/transport/TServerSocket.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TServerSocket.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TServerSocket.java
diff --git a/lib/java/src/org/apache/thrift/transport/TServerTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TServerTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TServerTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TServerTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSimpleFileTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TSimpleFileTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSimpleFileTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSimpleFileTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TSocket.java b/lib/java/src/main/java/org/apache/thrift/transport/TSocket.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TSocket.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TSocket.java
diff --git a/lib/java/src/org/apache/thrift/transport/TStandardFile.java b/lib/java/src/main/java/org/apache/thrift/transport/TStandardFile.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TStandardFile.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TStandardFile.java
diff --git a/lib/java/src/org/apache/thrift/transport/TTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/TTransportException.java b/lib/java/src/main/java/org/apache/thrift/transport/TTransportException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TTransportException.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TTransportException.java
diff --git a/lib/java/src/org/apache/thrift/transport/TTransportFactory.java b/lib/java/src/main/java/org/apache/thrift/transport/TTransportFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TTransportFactory.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TTransportFactory.java
diff --git a/lib/java/src/org/apache/thrift/transport/TZlibTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/TZlibTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/TZlibTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/TZlibTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/layered/TFastFramedTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/layered/TFastFramedTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/layered/TFastFramedTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/layered/TFastFramedTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/layered/TFramedTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/layered/TFramedTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/layered/TFramedTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/layered/TFramedTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/layered/TLayeredTransport.java b/lib/java/src/main/java/org/apache/thrift/transport/layered/TLayeredTransport.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/layered/TLayeredTransport.java
rename to lib/java/src/main/java/org/apache/thrift/transport/layered/TLayeredTransport.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/DataFrameHeaderReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/DataFrameHeaderReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/DataFrameHeaderReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/DataFrameHeaderReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/DataFrameReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/DataFrameReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/DataFrameReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/DataFrameReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/DataFrameWriter.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/DataFrameWriter.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/DataFrameWriter.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/DataFrameWriter.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/FixedSizeHeaderReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/FixedSizeHeaderReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/FixedSizeHeaderReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/FixedSizeHeaderReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/FrameHeaderReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/FrameHeaderReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/FrameHeaderReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/FrameHeaderReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/FrameReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/FrameReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/FrameReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/FrameReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/FrameWriter.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/FrameWriter.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/FrameWriter.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/FrameWriter.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/NegotiationStatus.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/NegotiationStatus.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/NegotiationStatus.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/NegotiationStatus.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/NonblockingSaslHandler.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/NonblockingSaslHandler.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/NonblockingSaslHandler.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/NonblockingSaslHandler.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/SaslNegotiationFrameReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslNegotiationFrameReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/SaslNegotiationFrameReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslNegotiationFrameReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/SaslNegotiationFrameWriter.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslNegotiationFrameWriter.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/SaslNegotiationFrameWriter.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslNegotiationFrameWriter.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/SaslNegotiationHeaderReader.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslNegotiationHeaderReader.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/SaslNegotiationHeaderReader.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslNegotiationHeaderReader.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/SaslPeer.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslPeer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/SaslPeer.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/SaslPeer.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/ServerSaslPeer.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/ServerSaslPeer.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/ServerSaslPeer.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/ServerSaslPeer.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/TBaseSaslProcessorFactory.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/TBaseSaslProcessorFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/TBaseSaslProcessorFactory.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/TBaseSaslProcessorFactory.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/TInvalidSaslFrameException.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/TInvalidSaslFrameException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/TInvalidSaslFrameException.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/TInvalidSaslFrameException.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/TSaslNegotiationException.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslNegotiationException.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/TSaslNegotiationException.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslNegotiationException.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/TSaslProcessorFactory.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslProcessorFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/TSaslProcessorFactory.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslProcessorFactory.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/TSaslServerDefinition.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslServerDefinition.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/TSaslServerDefinition.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslServerDefinition.java
diff --git a/lib/java/src/org/apache/thrift/transport/sasl/TSaslServerFactory.java b/lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslServerFactory.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/transport/sasl/TSaslServerFactory.java
rename to lib/java/src/main/java/org/apache/thrift/transport/sasl/TSaslServerFactory.java
diff --git a/lib/java/src/org/apache/thrift/utils/StringUtils.java b/lib/java/src/main/java/org/apache/thrift/utils/StringUtils.java
similarity index 100%
rename from lib/java/src/org/apache/thrift/utils/StringUtils.java
rename to lib/java/src/main/java/org/apache/thrift/utils/StringUtils.java
diff --git a/lib/java/test/org/apache/thrift/Fixtures.java b/lib/java/src/test/java/org/apache/thrift/Fixtures.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/Fixtures.java
rename to lib/java/src/test/java/org/apache/thrift/Fixtures.java
diff --git a/lib/java/test/org/apache/thrift/TestDeepCopy.java b/lib/java/src/test/java/org/apache/thrift/TestDeepCopy.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestDeepCopy.java
rename to lib/java/src/test/java/org/apache/thrift/TestDeepCopy.java
diff --git a/lib/java/test/org/apache/thrift/TestEnumContainers.java b/lib/java/src/test/java/org/apache/thrift/TestEnumContainers.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestEnumContainers.java
rename to lib/java/src/test/java/org/apache/thrift/TestEnumContainers.java
diff --git a/lib/java/test/org/apache/thrift/TestFullCamel.java b/lib/java/src/test/java/org/apache/thrift/TestFullCamel.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestFullCamel.java
rename to lib/java/src/test/java/org/apache/thrift/TestFullCamel.java
diff --git a/lib/java/test/org/apache/thrift/TestMultiplexedProcessor.java b/lib/java/src/test/java/org/apache/thrift/TestMultiplexedProcessor.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestMultiplexedProcessor.java
rename to lib/java/src/test/java/org/apache/thrift/TestMultiplexedProcessor.java
diff --git a/lib/java/test/org/apache/thrift/TestOptionType.java b/lib/java/src/test/java/org/apache/thrift/TestOptionType.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestOptionType.java
rename to lib/java/src/test/java/org/apache/thrift/TestOptionType.java
diff --git a/lib/java/test/org/apache/thrift/TestOptionals.java b/lib/java/src/test/java/org/apache/thrift/TestOptionals.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestOptionals.java
rename to lib/java/src/test/java/org/apache/thrift/TestOptionals.java
diff --git a/lib/java/test/org/apache/thrift/TestOptionalsWithJdk8.java b/lib/java/src/test/java/org/apache/thrift/TestOptionalsWithJdk8.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestOptionalsWithJdk8.java
rename to lib/java/src/test/java/org/apache/thrift/TestOptionalsWithJdk8.java
diff --git a/lib/java/test/org/apache/thrift/TestPartialThriftDeserializer.java b/lib/java/src/test/java/org/apache/thrift/TestPartialThriftDeserializer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestPartialThriftDeserializer.java
rename to lib/java/src/test/java/org/apache/thrift/TestPartialThriftDeserializer.java
diff --git a/lib/java/test/org/apache/thrift/TestRenderedDoubleConstants.java b/lib/java/src/test/java/org/apache/thrift/TestRenderedDoubleConstants.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestRenderedDoubleConstants.java
rename to lib/java/src/test/java/org/apache/thrift/TestRenderedDoubleConstants.java
diff --git a/lib/java/test/org/apache/thrift/TestReuse.java b/lib/java/src/test/java/org/apache/thrift/TestReuse.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestReuse.java
rename to lib/java/src/test/java/org/apache/thrift/TestReuse.java
diff --git a/lib/java/test/org/apache/thrift/TestStruct.java b/lib/java/src/test/java/org/apache/thrift/TestStruct.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestStruct.java
rename to lib/java/src/test/java/org/apache/thrift/TestStruct.java
diff --git a/lib/java/test/org/apache/thrift/TestTBaseHelper.java b/lib/java/src/test/java/org/apache/thrift/TestTBaseHelper.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestTBaseHelper.java
rename to lib/java/src/test/java/org/apache/thrift/TestTBaseHelper.java
diff --git a/lib/java/test/org/apache/thrift/TestTDeserializer.java b/lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestTDeserializer.java
rename to lib/java/src/test/java/org/apache/thrift/TestTDeserializer.java
diff --git a/lib/java/test/org/apache/thrift/TestTEnumHelper.java b/lib/java/src/test/java/org/apache/thrift/TestTEnumHelper.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestTEnumHelper.java
rename to lib/java/src/test/java/org/apache/thrift/TestTEnumHelper.java
diff --git a/lib/java/test/org/apache/thrift/TestTUnion.java b/lib/java/src/test/java/org/apache/thrift/TestTUnion.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestTUnion.java
rename to lib/java/src/test/java/org/apache/thrift/TestTUnion.java
diff --git a/lib/java/test/org/apache/thrift/TestUnsafeBinaries.java b/lib/java/src/test/java/org/apache/thrift/TestUnsafeBinaries.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/TestUnsafeBinaries.java
rename to lib/java/src/test/java/org/apache/thrift/TestUnsafeBinaries.java
diff --git a/lib/java/test/org/apache/thrift/async/TestTAsyncClient.java b/lib/java/src/test/java/org/apache/thrift/async/TestTAsyncClient.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/async/TestTAsyncClient.java
rename to lib/java/src/test/java/org/apache/thrift/async/TestTAsyncClient.java
diff --git a/lib/java/test/org/apache/thrift/async/TestTAsyncClientManager.java b/lib/java/src/test/java/org/apache/thrift/async/TestTAsyncClientManager.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/async/TestTAsyncClientManager.java
rename to lib/java/src/test/java/org/apache/thrift/async/TestTAsyncClientManager.java
diff --git a/lib/java/test/org/apache/thrift/partial/EnumCacheTest.java b/lib/java/src/test/java/org/apache/thrift/partial/EnumCacheTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/EnumCacheTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/EnumCacheTest.java
diff --git a/lib/java/test/org/apache/thrift/partial/ExceptionAsserts.java b/lib/java/src/test/java/org/apache/thrift/partial/ExceptionAsserts.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/ExceptionAsserts.java
rename to lib/java/src/test/java/org/apache/thrift/partial/ExceptionAsserts.java
diff --git a/lib/java/test/org/apache/thrift/partial/PartialThriftComparerTest.java b/lib/java/src/test/java/org/apache/thrift/partial/PartialThriftComparerTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/PartialThriftComparerTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/PartialThriftComparerTest.java
diff --git a/lib/java/test/org/apache/thrift/partial/PartialThriftTestData.java b/lib/java/src/test/java/org/apache/thrift/partial/PartialThriftTestData.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/PartialThriftTestData.java
rename to lib/java/src/test/java/org/apache/thrift/partial/PartialThriftTestData.java
diff --git a/lib/java/test/org/apache/thrift/partial/TFieldDataTest.java b/lib/java/src/test/java/org/apache/thrift/partial/TFieldDataTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/TFieldDataTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/TFieldDataTest.java
diff --git a/lib/java/test/org/apache/thrift/partial/TestData.java b/lib/java/src/test/java/org/apache/thrift/partial/TestData.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/TestData.java
rename to lib/java/src/test/java/org/apache/thrift/partial/TestData.java
diff --git a/lib/java/test/org/apache/thrift/partial/ThriftFieldTest.java b/lib/java/src/test/java/org/apache/thrift/partial/ThriftFieldTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/ThriftFieldTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/ThriftFieldTest.java
diff --git a/lib/java/test/org/apache/thrift/partial/ThriftMetadataTest.java b/lib/java/src/test/java/org/apache/thrift/partial/ThriftMetadataTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/ThriftMetadataTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/ThriftMetadataTest.java
diff --git a/lib/java/test/org/apache/thrift/partial/ThriftSerDe.java b/lib/java/src/test/java/org/apache/thrift/partial/ThriftSerDe.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/ThriftSerDe.java
rename to lib/java/src/test/java/org/apache/thrift/partial/ThriftSerDe.java
diff --git a/lib/java/test/org/apache/thrift/partial/ThriftStructProcessorTest.java b/lib/java/src/test/java/org/apache/thrift/partial/ThriftStructProcessorTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/ThriftStructProcessorTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/ThriftStructProcessorTest.java
diff --git a/lib/java/test/org/apache/thrift/partial/ValidateTest.java b/lib/java/src/test/java/org/apache/thrift/partial/ValidateTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/partial/ValidateTest.java
rename to lib/java/src/test/java/org/apache/thrift/partial/ValidateTest.java
diff --git a/lib/java/test/org/apache/thrift/protocol/BenchmarkProtocols.java b/lib/java/src/test/java/org/apache/thrift/protocol/BenchmarkProtocols.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/BenchmarkProtocols.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/BenchmarkProtocols.java
diff --git a/lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java b/lib/java/src/test/java/org/apache/thrift/protocol/ProtocolTestBase.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/ProtocolTestBase.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/ProtocolTestBase.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestShortStack.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestShortStack.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestShortStack.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestShortStack.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTBinaryProtocol.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTBinaryProtocol.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTBinaryProtocol.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTBinaryProtocol.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTCompactProtocol.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTCompactProtocol.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTCompactProtocol.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTField.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTField.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTField.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTField.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTJSONProtocol.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTJSONProtocol.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTJSONProtocol.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTJSONProtocol.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTProtocolUtil.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTProtocolUtil.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTProtocolUtil.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTProtocolUtil.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTSimpleJSONProtocol.java
diff --git a/lib/java/test/org/apache/thrift/protocol/TestTTupleProtocol.java b/lib/java/src/test/java/org/apache/thrift/protocol/TestTTupleProtocol.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/protocol/TestTTupleProtocol.java
rename to lib/java/src/test/java/org/apache/thrift/protocol/TestTTupleProtocol.java
diff --git a/lib/java/test/org/apache/thrift/scheme/TestStandardScheme.java b/lib/java/src/test/java/org/apache/thrift/scheme/TestStandardScheme.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/scheme/TestStandardScheme.java
rename to lib/java/src/test/java/org/apache/thrift/scheme/TestStandardScheme.java
diff --git a/lib/java/test/org/apache/thrift/server/ServerTestBase.java b/lib/java/src/test/java/org/apache/thrift/server/ServerTestBase.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/ServerTestBase.java
rename to lib/java/src/test/java/org/apache/thrift/server/ServerTestBase.java
diff --git a/lib/java/test/org/apache/thrift/server/TestAsyncServer.java b/lib/java/src/test/java/org/apache/thrift/server/TestAsyncServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/TestAsyncServer.java
rename to lib/java/src/test/java/org/apache/thrift/server/TestAsyncServer.java
diff --git a/lib/java/test/org/apache/thrift/server/TestHsHaServer.java b/lib/java/src/test/java/org/apache/thrift/server/TestHsHaServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/TestHsHaServer.java
rename to lib/java/src/test/java/org/apache/thrift/server/TestHsHaServer.java
diff --git a/lib/java/test/org/apache/thrift/server/TestNonblockingServer.java b/lib/java/src/test/java/org/apache/thrift/server/TestNonblockingServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/TestNonblockingServer.java
rename to lib/java/src/test/java/org/apache/thrift/server/TestNonblockingServer.java
diff --git a/lib/java/test/org/apache/thrift/server/TestSaslNonblockingServer.java b/lib/java/src/test/java/org/apache/thrift/server/TestSaslNonblockingServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/TestSaslNonblockingServer.java
rename to lib/java/src/test/java/org/apache/thrift/server/TestSaslNonblockingServer.java
diff --git a/lib/java/test/org/apache/thrift/server/TestThreadPoolServer.java b/lib/java/src/test/java/org/apache/thrift/server/TestThreadPoolServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/TestThreadPoolServer.java
rename to lib/java/src/test/java/org/apache/thrift/server/TestThreadPoolServer.java
diff --git a/lib/java/test/org/apache/thrift/server/TestThreadedSelectorServer.java b/lib/java/src/test/java/org/apache/thrift/server/TestThreadedSelectorServer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/server/TestThreadedSelectorServer.java
rename to lib/java/src/test/java/org/apache/thrift/server/TestThreadedSelectorServer.java
diff --git a/lib/java/test/org/apache/thrift/test/EqualityTest.java b/lib/java/src/test/java/org/apache/thrift/test/EqualityTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/EqualityTest.java
rename to lib/java/src/test/java/org/apache/thrift/test/EqualityTest.java
diff --git a/lib/java/test/org/apache/thrift/test/JavaBeansTest.java b/lib/java/src/test/java/org/apache/thrift/test/JavaBeansTest.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/JavaBeansTest.java
rename to lib/java/src/test/java/org/apache/thrift/test/JavaBeansTest.java
diff --git a/lib/java/test/org/apache/thrift/test/ReadStruct.java b/lib/java/src/test/java/org/apache/thrift/test/ReadStruct.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/ReadStruct.java
rename to lib/java/src/test/java/org/apache/thrift/test/ReadStruct.java
diff --git a/lib/java/test/org/apache/thrift/test/SerializationBenchmark.java b/lib/java/src/test/java/org/apache/thrift/test/SerializationBenchmark.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/SerializationBenchmark.java
rename to lib/java/src/test/java/org/apache/thrift/test/SerializationBenchmark.java
diff --git a/lib/java/test/org/apache/thrift/test/TestServlet.java b/lib/java/src/test/java/org/apache/thrift/test/TestServlet.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/TestServlet.java
rename to lib/java/src/test/java/org/apache/thrift/test/TestServlet.java
diff --git a/lib/java/test/org/apache/thrift/test/WriteStruct.java b/lib/java/src/test/java/org/apache/thrift/test/WriteStruct.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/WriteStruct.java
rename to lib/java/src/test/java/org/apache/thrift/test/WriteStruct.java
diff --git a/lib/java/test/org/apache/thrift/test/voidmethexceptions/ServiceAsyncImp.java b/lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/ServiceAsyncImp.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/voidmethexceptions/ServiceAsyncImp.java
rename to lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/ServiceAsyncImp.java
diff --git a/lib/java/test/org/apache/thrift/test/voidmethexceptions/ServiceBase.java b/lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/ServiceBase.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/voidmethexceptions/ServiceBase.java
rename to lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/ServiceBase.java
diff --git a/lib/java/test/org/apache/thrift/test/voidmethexceptions/ServiceSyncImp.java b/lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/ServiceSyncImp.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/voidmethexceptions/ServiceSyncImp.java
rename to lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/ServiceSyncImp.java
diff --git a/lib/java/test/org/apache/thrift/test/voidmethexceptions/TestVoidMethExceptions.java b/lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/TestVoidMethExceptions.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/test/voidmethexceptions/TestVoidMethExceptions.java
rename to lib/java/src/test/java/org/apache/thrift/test/voidmethexceptions/TestVoidMethExceptions.java
diff --git a/lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/ReadCountingTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/ReadCountingTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/ReadCountingTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBuffer.java b/lib/java/src/test/java/org/apache/thrift/transport/TestAutoExpandingBuffer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestAutoExpandingBuffer.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestAutoExpandingBuffer.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestAutoExpandingBufferReadTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestAutoExpandingBufferWriteTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestNonblockingServerSocket.java b/lib/java/src/test/java/org/apache/thrift/transport/TestNonblockingServerSocket.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestNonblockingServerSocket.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestNonblockingServerSocket.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTByteBuffer.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTByteBuffer.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTByteBuffer.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTByteBuffer.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTFastFramedTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTFastFramedTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTFastFramedTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTFastFramedTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTFramedTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTFramedTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTFramedTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTFramedTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTIOStreamTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTIOStreamTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTIOStreamTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTIOStreamTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTMemoryInputTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTMemoryInputTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTMemoryInputTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTMemoryInputTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTMemoryTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTMemoryTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTMemoryTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTMemoryTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactory.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactory.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactory.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactory.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient1.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactoryCustomClient2.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryStreamedStore.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactoryStreamedStore.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTSSLTransportFactoryStreamedStore.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTSSLTransportFactoryStreamedStore.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTSaslTransports.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTSaslTransports.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTSaslTransports.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTSimpleFileTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTSimpleFileTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTSimpleFileTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTSimpleFileTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/TestTZlibTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/TestTZlibTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/TestTZlibTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/TestTZlibTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java b/lib/java/src/test/java/org/apache/thrift/transport/WriteCountingTransport.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/WriteCountingTransport.java
rename to lib/java/src/test/java/org/apache/thrift/transport/WriteCountingTransport.java
diff --git a/lib/java/test/org/apache/thrift/transport/sasl/TestDataFrameReader.java b/lib/java/src/test/java/org/apache/thrift/transport/sasl/TestDataFrameReader.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/sasl/TestDataFrameReader.java
rename to lib/java/src/test/java/org/apache/thrift/transport/sasl/TestDataFrameReader.java
diff --git a/lib/java/test/org/apache/thrift/transport/sasl/TestDataFrameWriter.java b/lib/java/src/test/java/org/apache/thrift/transport/sasl/TestDataFrameWriter.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/sasl/TestDataFrameWriter.java
rename to lib/java/src/test/java/org/apache/thrift/transport/sasl/TestDataFrameWriter.java
diff --git a/lib/java/test/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameReader.java b/lib/java/src/test/java/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameReader.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameReader.java
rename to lib/java/src/test/java/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameReader.java
diff --git a/lib/java/test/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameWriter.java b/lib/java/src/test/java/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameWriter.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameWriter.java
rename to lib/java/src/test/java/org/apache/thrift/transport/sasl/TestSaslNegotiationFrameWriter.java
diff --git a/lib/java/test/org/apache/thrift/utils/TestStringUtils.java b/lib/java/src/test/java/org/apache/thrift/utils/TestStringUtils.java
similarity index 100%
rename from lib/java/test/org/apache/thrift/utils/TestStringUtils.java
rename to lib/java/src/test/java/org/apache/thrift/utils/TestStringUtils.java
diff --git a/lib/java/test/resources/JavaBeansTest.thrift b/lib/java/src/test/resources/JavaBeansTest.thrift
similarity index 100%
rename from lib/java/test/resources/JavaBeansTest.thrift
rename to lib/java/src/test/resources/JavaBeansTest.thrift
diff --git a/lib/java/test/resources/JavaBinaryDefault.thrift b/lib/java/src/test/resources/JavaBinaryDefault.thrift
similarity index 100%
rename from lib/java/test/resources/JavaBinaryDefault.thrift
rename to lib/java/src/test/resources/JavaBinaryDefault.thrift
diff --git a/lib/java/test/resources/JavaDeepCopyTest.thrift b/lib/java/src/test/resources/JavaDeepCopyTest.thrift
similarity index 100%
rename from lib/java/test/resources/JavaDeepCopyTest.thrift
rename to lib/java/src/test/resources/JavaDeepCopyTest.thrift
diff --git a/lib/java/test/resources/JavaOptionTypeJdk8Test.thrift b/lib/java/src/test/resources/JavaOptionTypeJdk8Test.thrift
similarity index 100%
rename from lib/java/test/resources/JavaOptionTypeJdk8Test.thrift
rename to lib/java/src/test/resources/JavaOptionTypeJdk8Test.thrift
diff --git a/lib/java/test/resources/JavaTypes.thrift b/lib/java/src/test/resources/JavaTypes.thrift
similarity index 100%
rename from lib/java/test/resources/JavaTypes.thrift
rename to lib/java/src/test/resources/JavaTypes.thrift
diff --git a/lib/java/test/resources/log4j.properties b/lib/java/src/test/resources/log4j.properties
similarity index 100%
rename from lib/java/test/resources/log4j.properties
rename to lib/java/src/test/resources/log4j.properties