diff --git a/lib/java/src/TApplicationException.java b/lib/java/src/com/facebook/thrift/TApplicationException.java
similarity index 100%
rename from lib/java/src/TApplicationException.java
rename to lib/java/src/com/facebook/thrift/TApplicationException.java
diff --git a/lib/java/src/TBase.java b/lib/java/src/com/facebook/thrift/TBase.java
similarity index 100%
rename from lib/java/src/TBase.java
rename to lib/java/src/com/facebook/thrift/TBase.java
diff --git a/lib/java/src/TByteArrayOutputStream.java b/lib/java/src/com/facebook/thrift/TByteArrayOutputStream.java
similarity index 100%
rename from lib/java/src/TByteArrayOutputStream.java
rename to lib/java/src/com/facebook/thrift/TByteArrayOutputStream.java
diff --git a/lib/java/src/TDeserializer.java b/lib/java/src/com/facebook/thrift/TDeserializer.java
similarity index 100%
rename from lib/java/src/TDeserializer.java
rename to lib/java/src/com/facebook/thrift/TDeserializer.java
diff --git a/lib/java/src/TException.java b/lib/java/src/com/facebook/thrift/TException.java
similarity index 100%
rename from lib/java/src/TException.java
rename to lib/java/src/com/facebook/thrift/TException.java
diff --git a/lib/java/src/TProcessor.java b/lib/java/src/com/facebook/thrift/TProcessor.java
similarity index 100%
rename from lib/java/src/TProcessor.java
rename to lib/java/src/com/facebook/thrift/TProcessor.java
diff --git a/lib/java/src/TProcessorFactory.java b/lib/java/src/com/facebook/thrift/TProcessorFactory.java
similarity index 100%
rename from lib/java/src/TProcessorFactory.java
rename to lib/java/src/com/facebook/thrift/TProcessorFactory.java
diff --git a/lib/java/src/TSerializer.java b/lib/java/src/com/facebook/thrift/TSerializer.java
similarity index 100%
rename from lib/java/src/TSerializer.java
rename to lib/java/src/com/facebook/thrift/TSerializer.java
diff --git a/lib/java/src/protocol/TBase64Utils.java b/lib/java/src/com/facebook/thrift/protocol/TBase64Utils.java
similarity index 100%
rename from lib/java/src/protocol/TBase64Utils.java
rename to lib/java/src/com/facebook/thrift/protocol/TBase64Utils.java
diff --git a/lib/java/src/protocol/TBinaryProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java
similarity index 100%
rename from lib/java/src/protocol/TBinaryProtocol.java
rename to lib/java/src/com/facebook/thrift/protocol/TBinaryProtocol.java
diff --git a/lib/java/src/protocol/TField.java b/lib/java/src/com/facebook/thrift/protocol/TField.java
similarity index 100%
rename from lib/java/src/protocol/TField.java
rename to lib/java/src/com/facebook/thrift/protocol/TField.java
diff --git a/lib/java/src/protocol/TJSONProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TJSONProtocol.java
similarity index 100%
rename from lib/java/src/protocol/TJSONProtocol.java
rename to lib/java/src/com/facebook/thrift/protocol/TJSONProtocol.java
diff --git a/lib/java/src/protocol/TList.java b/lib/java/src/com/facebook/thrift/protocol/TList.java
similarity index 100%
rename from lib/java/src/protocol/TList.java
rename to lib/java/src/com/facebook/thrift/protocol/TList.java
diff --git a/lib/java/src/protocol/TMap.java b/lib/java/src/com/facebook/thrift/protocol/TMap.java
similarity index 100%
rename from lib/java/src/protocol/TMap.java
rename to lib/java/src/com/facebook/thrift/protocol/TMap.java
diff --git a/lib/java/src/protocol/TMessage.java b/lib/java/src/com/facebook/thrift/protocol/TMessage.java
similarity index 100%
rename from lib/java/src/protocol/TMessage.java
rename to lib/java/src/com/facebook/thrift/protocol/TMessage.java
diff --git a/lib/java/src/protocol/TMessageType.java b/lib/java/src/com/facebook/thrift/protocol/TMessageType.java
similarity index 100%
rename from lib/java/src/protocol/TMessageType.java
rename to lib/java/src/com/facebook/thrift/protocol/TMessageType.java
diff --git a/lib/java/src/protocol/TProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TProtocol.java
similarity index 100%
rename from lib/java/src/protocol/TProtocol.java
rename to lib/java/src/com/facebook/thrift/protocol/TProtocol.java
diff --git a/lib/java/src/protocol/TProtocolException.java b/lib/java/src/com/facebook/thrift/protocol/TProtocolException.java
similarity index 100%
rename from lib/java/src/protocol/TProtocolException.java
rename to lib/java/src/com/facebook/thrift/protocol/TProtocolException.java
diff --git a/lib/java/src/protocol/TProtocolFactory.java b/lib/java/src/com/facebook/thrift/protocol/TProtocolFactory.java
similarity index 100%
rename from lib/java/src/protocol/TProtocolFactory.java
rename to lib/java/src/com/facebook/thrift/protocol/TProtocolFactory.java
diff --git a/lib/java/src/protocol/TProtocolUtil.java b/lib/java/src/com/facebook/thrift/protocol/TProtocolUtil.java
similarity index 100%
rename from lib/java/src/protocol/TProtocolUtil.java
rename to lib/java/src/com/facebook/thrift/protocol/TProtocolUtil.java
diff --git a/lib/java/src/protocol/TSet.java b/lib/java/src/com/facebook/thrift/protocol/TSet.java
similarity index 100%
rename from lib/java/src/protocol/TSet.java
rename to lib/java/src/com/facebook/thrift/protocol/TSet.java
diff --git a/lib/java/src/protocol/TSimpleJSONProtocol.java b/lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java
similarity index 100%
rename from lib/java/src/protocol/TSimpleJSONProtocol.java
rename to lib/java/src/com/facebook/thrift/protocol/TSimpleJSONProtocol.java
diff --git a/lib/java/src/protocol/TStruct.java b/lib/java/src/com/facebook/thrift/protocol/TStruct.java
similarity index 100%
rename from lib/java/src/protocol/TStruct.java
rename to lib/java/src/com/facebook/thrift/protocol/TStruct.java
diff --git a/lib/java/src/protocol/TType.java b/lib/java/src/com/facebook/thrift/protocol/TType.java
similarity index 100%
rename from lib/java/src/protocol/TType.java
rename to lib/java/src/com/facebook/thrift/protocol/TType.java
diff --git a/lib/java/src/reflection/limited/Argument.java b/lib/java/src/com/facebook/thrift/reflection/limited/Argument.java
similarity index 100%
rename from lib/java/src/reflection/limited/Argument.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/Argument.java
diff --git a/lib/java/src/reflection/limited/Constants.java b/lib/java/src/com/facebook/thrift/reflection/limited/Constants.java
similarity index 100%
rename from lib/java/src/reflection/limited/Constants.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/Constants.java
diff --git a/lib/java/src/reflection/limited/ContainerType.java b/lib/java/src/com/facebook/thrift/reflection/limited/ContainerType.java
similarity index 100%
rename from lib/java/src/reflection/limited/ContainerType.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/ContainerType.java
diff --git a/lib/java/src/reflection/limited/Method.java b/lib/java/src/com/facebook/thrift/reflection/limited/Method.java
similarity index 100%
rename from lib/java/src/reflection/limited/Method.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/Method.java
diff --git a/lib/java/src/reflection/limited/Service.java b/lib/java/src/com/facebook/thrift/reflection/limited/Service.java
similarity index 100%
rename from lib/java/src/reflection/limited/Service.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/Service.java
diff --git a/lib/java/src/reflection/limited/SimpleType.java b/lib/java/src/com/facebook/thrift/reflection/limited/SimpleType.java
similarity index 100%
rename from lib/java/src/reflection/limited/SimpleType.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/SimpleType.java
diff --git a/lib/java/src/reflection/limited/TTypeTag.java b/lib/java/src/com/facebook/thrift/reflection/limited/TTypeTag.java
similarity index 100%
rename from lib/java/src/reflection/limited/TTypeTag.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/TTypeTag.java
diff --git a/lib/java/src/reflection/limited/ThriftType.java b/lib/java/src/com/facebook/thrift/reflection/limited/ThriftType.java
similarity index 100%
rename from lib/java/src/reflection/limited/ThriftType.java
rename to lib/java/src/com/facebook/thrift/reflection/limited/ThriftType.java
diff --git a/lib/java/src/server/TServer.java b/lib/java/src/com/facebook/thrift/server/TServer.java
similarity index 100%
rename from lib/java/src/server/TServer.java
rename to lib/java/src/com/facebook/thrift/server/TServer.java
diff --git a/lib/java/src/server/TSimpleServer.java b/lib/java/src/com/facebook/thrift/server/TSimpleServer.java
similarity index 100%
rename from lib/java/src/server/TSimpleServer.java
rename to lib/java/src/com/facebook/thrift/server/TSimpleServer.java
diff --git a/lib/java/src/server/TThreadPoolServer.java b/lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java
similarity index 100%
rename from lib/java/src/server/TThreadPoolServer.java
rename to lib/java/src/com/facebook/thrift/server/TThreadPoolServer.java
diff --git a/lib/java/src/transport/TFramedTransport.java b/lib/java/src/com/facebook/thrift/transport/TFramedTransport.java
similarity index 100%
rename from lib/java/src/transport/TFramedTransport.java
rename to lib/java/src/com/facebook/thrift/transport/TFramedTransport.java
diff --git a/lib/java/src/transport/THttpClient.java b/lib/java/src/com/facebook/thrift/transport/THttpClient.java
similarity index 100%
rename from lib/java/src/transport/THttpClient.java
rename to lib/java/src/com/facebook/thrift/transport/THttpClient.java
diff --git a/lib/java/src/transport/TIOStreamTransport.java b/lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java
similarity index 100%
rename from lib/java/src/transport/TIOStreamTransport.java
rename to lib/java/src/com/facebook/thrift/transport/TIOStreamTransport.java
diff --git a/lib/java/src/transport/TMemoryBuffer.java b/lib/java/src/com/facebook/thrift/transport/TMemoryBuffer.java
similarity index 100%
rename from lib/java/src/transport/TMemoryBuffer.java
rename to lib/java/src/com/facebook/thrift/transport/TMemoryBuffer.java
diff --git a/lib/java/src/transport/TServerSocket.java b/lib/java/src/com/facebook/thrift/transport/TServerSocket.java
similarity index 100%
rename from lib/java/src/transport/TServerSocket.java
rename to lib/java/src/com/facebook/thrift/transport/TServerSocket.java
diff --git a/lib/java/src/transport/TServerTransport.java b/lib/java/src/com/facebook/thrift/transport/TServerTransport.java
similarity index 100%
rename from lib/java/src/transport/TServerTransport.java
rename to lib/java/src/com/facebook/thrift/transport/TServerTransport.java
diff --git a/lib/java/src/transport/TSocket.java b/lib/java/src/com/facebook/thrift/transport/TSocket.java
similarity index 100%
rename from lib/java/src/transport/TSocket.java
rename to lib/java/src/com/facebook/thrift/transport/TSocket.java
diff --git a/lib/java/src/transport/TTransport.java b/lib/java/src/com/facebook/thrift/transport/TTransport.java
similarity index 100%
rename from lib/java/src/transport/TTransport.java
rename to lib/java/src/com/facebook/thrift/transport/TTransport.java
diff --git a/lib/java/src/transport/TTransportException.java b/lib/java/src/com/facebook/thrift/transport/TTransportException.java
similarity index 100%
rename from lib/java/src/transport/TTransportException.java
rename to lib/java/src/com/facebook/thrift/transport/TTransportException.java
diff --git a/lib/java/src/transport/TTransportFactory.java b/lib/java/src/com/facebook/thrift/transport/TTransportFactory.java
similarity index 100%
rename from lib/java/src/transport/TTransportFactory.java
rename to lib/java/src/com/facebook/thrift/transport/TTransportFactory.java