THRIFT-4459: reduce php library directory depth

Client: php

This closes #1471

66 files changed, 75 insertions, 79 deletions

diff --git a/composer.json b/composer.json
index c14dd9911..af0135df4 100644
--- a/composer.json
+++ b/composer.json
@@ -22,10 +22,10 @@
         "phpunit/phpunit": "~4.8.36"
     },
     "autoload": {
-        "psr-4": {"Thrift\\": "lib/php/lib/Thrift/"}
+        "psr-4": {"Thrift\\": "lib/php/lib/"}
     },
     "autoload-dev": {
-        "psr-4": {"Test\\Thrift\\": "lib/php/test/Test/Thrift/"}
+        "psr-4": {"Test\\Thrift\\": "lib/php/test/"}
     },
     "minimum-stability": "dev",
     "extra": {
diff --git a/lib/php/Makefile.am b/lib/php/Makefile.am
index 5aa3be49b..8d9050a1d 100755
--- a/lib/php/Makefile.am
+++ b/lib/php/Makefile.am
@@ -37,96 +37,96 @@ distclean-local:
 
 endif
 
-phpdir = $(PHP_PREFIX)/Thrift
+phpdir = $(PHP_PREFIX)/
 php_DATA = \
-  lib/Thrift/TMultiplexedProcessor.php
+  lib/TMultiplexedProcessor.php
 
 phpbasedir = $(phpdir)/Base
 phpbase_DATA = \
-  lib/Thrift/Base/TBase.php
+  lib/Base/TBase.php
 
 phpclassloaderdir = $(phpdir)/ClassLoader
 phpclassloader_DATA = \
-  lib/Thrift/ClassLoader/ThriftClassLoader.php
+  lib/ClassLoader/ThriftClassLoader.php
 
 phpexceptiondir = $(phpdir)/Exception
 phpexception_DATA = \
-  lib/Thrift/Exception/TApplicationException.php \
-  lib/Thrift/Exception/TException.php \
-  lib/Thrift/Exception/TProtocolException.php \
-  lib/Thrift/Exception/TTransportException.php
+  lib/Exception/TApplicationException.php \
+  lib/Exception/TException.php \
+  lib/Exception/TProtocolException.php \
+  lib/Exception/TTransportException.php
 
 phpfactorydir = $(phpdir)/Factory
 phpfactory_DATA = \
-  lib/Thrift/Factory/TBinaryProtocolFactory.php \
-  lib/Thrift/Factory/TCompactProtocolFactory.php \
-  lib/Thrift/Factory/TJSONProtocolFactory.php \
-  lib/Thrift/Factory/TProtocolFactory.php \
-  lib/Thrift/Factory/TStringFuncFactory.php \
-  lib/Thrift/Factory/TTransportFactory.php
+  lib/Factory/TBinaryProtocolFactory.php \
+  lib/Factory/TCompactProtocolFactory.php \
+  lib/Factory/TJSONProtocolFactory.php \
+  lib/Factory/TProtocolFactory.php \
+  lib/Factory/TStringFuncFactory.php \
+  lib/Factory/TTransportFactory.php
 
 phpprotocoldir = $(phpdir)/Protocol
 phpprotocol_DATA = \
-  lib/Thrift/Protocol/TBinaryProtocolAccelerated.php \
-  lib/Thrift/Protocol/TBinaryProtocol.php \
-  lib/Thrift/Protocol/TCompactProtocol.php \
-  lib/Thrift/Protocol/TJSONProtocol.php \
-  lib/Thrift/Protocol/TMultiplexedProtocol.php \
-  lib/Thrift/Protocol/TProtocol.php \
-  lib/Thrift/Protocol/TProtocolDecorator.php \
-  lib/Thrift/Protocol/TSimpleJSONProtocol.php
+  lib/Protocol/TBinaryProtocolAccelerated.php \
+  lib/Protocol/TBinaryProtocol.php \
+  lib/Protocol/TCompactProtocol.php \
+  lib/Protocol/TJSONProtocol.php \
+  lib/Protocol/TMultiplexedProtocol.php \
+  lib/Protocol/TProtocol.php \
+  lib/Protocol/TProtocolDecorator.php \
+  lib/Protocol/TSimpleJSONProtocol.php
 
 phpprotocoljsondir = $(phpprotocoldir)/JSON
 phpprotocoljson_DATA = \
-  lib/Thrift/Protocol/JSON/BaseContext.php \
-  lib/Thrift/Protocol/JSON/ListContext.php \
-  lib/Thrift/Protocol/JSON/LookaheadReader.php \
-  lib/Thrift/Protocol/JSON/PairContext.php
+  lib/Protocol/JSON/BaseContext.php \
+  lib/Protocol/JSON/ListContext.php \
+  lib/Protocol/JSON/LookaheadReader.php \
+  lib/Protocol/JSON/PairContext.php
 
 phpprotocolsimplejsondir = $(phpprotocoldir)/SimpleJSON
 phpprotocolsimplejson_DATA = \
-  lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php \
-  lib/Thrift/Protocol/SimpleJSON/Context.php \
-  lib/Thrift/Protocol/SimpleJSON/ListContext.php \
-  lib/Thrift/Protocol/SimpleJSON/MapContext.php \
-  lib/Thrift/Protocol/SimpleJSON/StructContext.php
+  lib/Protocol/SimpleJSON/CollectionMapKeyException.php \
+  lib/Protocol/SimpleJSON/Context.php \
+  lib/Protocol/SimpleJSON/ListContext.php \
+  lib/Protocol/SimpleJSON/MapContext.php \
+  lib/Protocol/SimpleJSON/StructContext.php
 
 phpserializerdir = $(phpdir)/Serializer
 phpserializer_DATA = \
-  lib/Thrift/Serializer/TBinarySerializer.php
+  lib/Serializer/TBinarySerializer.php
 
 phpserverdir = $(phpdir)/Server
 phpserver_DATA = \
-  lib/Thrift/Server/TServerSocket.php \
-  lib/Thrift/Server/TForkingServer.php \
-  lib/Thrift/Server/TServer.php \
-  lib/Thrift/Server/TServerTransport.php \
-  lib/Thrift/Server/TSimpleServer.php
+  lib/Server/TServerSocket.php \
+  lib/Server/TForkingServer.php \
+  lib/Server/TServer.php \
+  lib/Server/TServerTransport.php \
+  lib/Server/TSimpleServer.php
 
 phpstringfuncdir = $(phpdir)/StringFunc
 phpstringfunc_DATA = \
-  lib/Thrift/StringFunc/Mbstring.php \
-  lib/Thrift/StringFunc/Core.php \
-  lib/Thrift/StringFunc/TStringFunc.php
+  lib/StringFunc/Mbstring.php \
+  lib/StringFunc/Core.php \
+  lib/StringFunc/TStringFunc.php
 
 phptransportdir = $(phpdir)/Transport
 phptransport_DATA = \
-  lib/Thrift/Transport/TBufferedTransport.php \
-  lib/Thrift/Transport/TCurlClient.php \
-  lib/Thrift/Transport/TFramedTransport.php \
-  lib/Thrift/Transport/THttpClient.php \
-  lib/Thrift/Transport/TMemoryBuffer.php \
-  lib/Thrift/Transport/TNullTransport.php \
-  lib/Thrift/Transport/TPhpStream.php \
-  lib/Thrift/Transport/TSocket.php \
-  lib/Thrift/Transport/TSocketPool.php \
-  lib/Thrift/Transport/TTransport.php
+  lib/Transport/TBufferedTransport.php \
+  lib/Transport/TCurlClient.php \
+  lib/Transport/TFramedTransport.php \
+  lib/Transport/THttpClient.php \
+  lib/Transport/TMemoryBuffer.php \
+  lib/Transport/TNullTransport.php \
+  lib/Transport/TPhpStream.php \
+  lib/Transport/TSocket.php \
+  lib/Transport/TSocketPool.php \
+  lib/Transport/TTransport.php
 
 phptypedir = $(phpdir)/Type
 phptype_DATA = \
-  lib/Thrift/Type/TMessageType.php \
-  lib/Thrift/Type/TType.php \
-  lib/Thrift/Type/TConstant.php
+  lib/Type/TMessageType.php \
+  lib/Type/TType.php \
+  lib/Type/TConstant.php
 
 EXTRA_DIST = \
   lib \
diff --git a/lib/php/lib/Thrift/Base/TBase.php b/lib/php/lib/Base/TBase.php
index 4195f75df..4195f75df 100644
--- a/lib/php/lib/Thrift/Base/TBase.php
+++ b/lib/php/lib/Base/TBase.php
diff --git a/lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php b/lib/php/lib/ClassLoader/ThriftClassLoader.php
index 67575ce18..67575ce18 100644
--- a/lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php
+++ b/lib/php/lib/ClassLoader/ThriftClassLoader.php
diff --git a/lib/php/lib/Thrift/Exception/TApplicationException.php b/lib/php/lib/Exception/TApplicationException.php
index b1689fc34..b1689fc34 100644
--- a/lib/php/lib/Thrift/Exception/TApplicationException.php
+++ b/lib/php/lib/Exception/TApplicationException.php
diff --git a/lib/php/lib/Thrift/Exception/TException.php b/lib/php/lib/Exception/TException.php
index 5c0684384..5c0684384 100644
--- a/lib/php/lib/Thrift/Exception/TException.php
+++ b/lib/php/lib/Exception/TException.php
diff --git a/lib/php/lib/Thrift/Exception/TProtocolException.php b/lib/php/lib/Exception/TProtocolException.php
index ba7135c29..ba7135c29 100644
--- a/lib/php/lib/Thrift/Exception/TProtocolException.php
+++ b/lib/php/lib/Exception/TProtocolException.php
diff --git a/lib/php/lib/Thrift/Exception/TTransportException.php b/lib/php/lib/Exception/TTransportException.php
index 0074467d6..0074467d6 100644
--- a/lib/php/lib/Thrift/Exception/TTransportException.php
+++ b/lib/php/lib/Exception/TTransportException.php
diff --git a/lib/php/lib/Thrift/Factory/TBinaryProtocolFactory.php b/lib/php/lib/Factory/TBinaryProtocolFactory.php
index 0c1c4a726..0c1c4a726 100644
--- a/lib/php/lib/Thrift/Factory/TBinaryProtocolFactory.php
+++ b/lib/php/lib/Factory/TBinaryProtocolFactory.php
diff --git a/lib/php/lib/Thrift/Factory/TCompactProtocolFactory.php b/lib/php/lib/Factory/TCompactProtocolFactory.php
index f4b4fe3eb..f4b4fe3eb 100644
--- a/lib/php/lib/Thrift/Factory/TCompactProtocolFactory.php
+++ b/lib/php/lib/Factory/TCompactProtocolFactory.php
diff --git a/lib/php/lib/Thrift/Factory/TJSONProtocolFactory.php b/lib/php/lib/Factory/TJSONProtocolFactory.php
index fbfb1d731..fbfb1d731 100644
--- a/lib/php/lib/Thrift/Factory/TJSONProtocolFactory.php
+++ b/lib/php/lib/Factory/TJSONProtocolFactory.php
diff --git a/lib/php/lib/Thrift/Factory/TProtocolFactory.php b/lib/php/lib/Factory/TProtocolFactory.php
index 4c9562ddb..4c9562ddb 100644
--- a/lib/php/lib/Thrift/Factory/TProtocolFactory.php
+++ b/lib/php/lib/Factory/TProtocolFactory.php
diff --git a/lib/php/lib/Thrift/Factory/TStringFuncFactory.php b/lib/php/lib/Factory/TStringFuncFactory.php
index 6ad6839c8..6ad6839c8 100644
--- a/lib/php/lib/Thrift/Factory/TStringFuncFactory.php
+++ b/lib/php/lib/Factory/TStringFuncFactory.php
diff --git a/lib/php/lib/Thrift/Factory/TTransportFactory.php b/lib/php/lib/Factory/TTransportFactory.php
index b32b5f414..b32b5f414 100644
--- a/lib/php/lib/Thrift/Factory/TTransportFactory.php
+++ b/lib/php/lib/Factory/TTransportFactory.php
diff --git a/lib/php/lib/Thrift/Protocol/JSON/BaseContext.php b/lib/php/lib/Protocol/JSON/BaseContext.php
index 31bcb48e4..31bcb48e4 100644
--- a/lib/php/lib/Thrift/Protocol/JSON/BaseContext.php
+++ b/lib/php/lib/Protocol/JSON/BaseContext.php
diff --git a/lib/php/lib/Thrift/Protocol/JSON/ListContext.php b/lib/php/lib/Protocol/JSON/ListContext.php
index eef659442..eef659442 100644
--- a/lib/php/lib/Thrift/Protocol/JSON/ListContext.php
+++ b/lib/php/lib/Protocol/JSON/ListContext.php
diff --git a/lib/php/lib/Thrift/Protocol/JSON/LookaheadReader.php b/lib/php/lib/Protocol/JSON/LookaheadReader.php
index 0b18c40d0..0b18c40d0 100644
--- a/lib/php/lib/Thrift/Protocol/JSON/LookaheadReader.php
+++ b/lib/php/lib/Protocol/JSON/LookaheadReader.php
diff --git a/lib/php/lib/Thrift/Protocol/JSON/PairContext.php b/lib/php/lib/Protocol/JSON/PairContext.php
index 7b353c4ad..7b353c4ad 100644
--- a/lib/php/lib/Thrift/Protocol/JSON/PairContext.php
+++ b/lib/php/lib/Protocol/JSON/PairContext.php
diff --git a/lib/php/lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php b/lib/php/lib/Protocol/SimpleJSON/CollectionMapKeyException.php
index 522b85a5b..522b85a5b 100644
--- a/lib/php/lib/Thrift/Protocol/SimpleJSON/CollectionMapKeyException.php
+++ b/lib/php/lib/Protocol/SimpleJSON/CollectionMapKeyException.php
diff --git a/lib/php/lib/Thrift/Protocol/SimpleJSON/Context.php b/lib/php/lib/Protocol/SimpleJSON/Context.php
index dcffbcbe9..dcffbcbe9 100644
--- a/lib/php/lib/Thrift/Protocol/SimpleJSON/Context.php
+++ b/lib/php/lib/Protocol/SimpleJSON/Context.php
diff --git a/lib/php/lib/Thrift/Protocol/SimpleJSON/ListContext.php b/lib/php/lib/Protocol/SimpleJSON/ListContext.php
index 6f346d8f8..6f346d8f8 100644
--- a/lib/php/lib/Thrift/Protocol/SimpleJSON/ListContext.php
+++ b/lib/php/lib/Protocol/SimpleJSON/ListContext.php
diff --git a/lib/php/lib/Thrift/Protocol/SimpleJSON/MapContext.php b/lib/php/lib/Protocol/SimpleJSON/MapContext.php
index bb9a04d21..bb9a04d21 100644
--- a/lib/php/lib/Thrift/Protocol/SimpleJSON/MapContext.php
+++ b/lib/php/lib/Protocol/SimpleJSON/MapContext.php
diff --git a/lib/php/lib/Thrift/Protocol/SimpleJSON/StructContext.php b/lib/php/lib/Protocol/SimpleJSON/StructContext.php
index 8162f2bc2..8162f2bc2 100644
--- a/lib/php/lib/Thrift/Protocol/SimpleJSON/StructContext.php
+++ b/lib/php/lib/Protocol/SimpleJSON/StructContext.php
diff --git a/lib/php/lib/Thrift/Protocol/TBinaryProtocol.php b/lib/php/lib/Protocol/TBinaryProtocol.php
index fe6a10343..fe6a10343 100644
--- a/lib/php/lib/Thrift/Protocol/TBinaryProtocol.php
+++ b/lib/php/lib/Protocol/TBinaryProtocol.php
diff --git a/lib/php/lib/Thrift/Protocol/TBinaryProtocolAccelerated.php b/lib/php/lib/Protocol/TBinaryProtocolAccelerated.php
index f0e0bb99f..f0e0bb99f 100644
--- a/lib/php/lib/Thrift/Protocol/TBinaryProtocolAccelerated.php
+++ b/lib/php/lib/Protocol/TBinaryProtocolAccelerated.php
diff --git a/lib/php/lib/Thrift/Protocol/TCompactProtocol.php b/lib/php/lib/Protocol/TCompactProtocol.php
index c25b0501b..c25b0501b 100644
--- a/lib/php/lib/Thrift/Protocol/TCompactProtocol.php
+++ b/lib/php/lib/Protocol/TCompactProtocol.php
diff --git a/lib/php/lib/Thrift/Protocol/TJSONProtocol.php b/lib/php/lib/Protocol/TJSONProtocol.php
index 6d8e81faa..6d8e81faa 100644
--- a/lib/php/lib/Thrift/Protocol/TJSONProtocol.php
+++ b/lib/php/lib/Protocol/TJSONProtocol.php
diff --git a/lib/php/lib/Thrift/Protocol/TMultiplexedProtocol.php b/lib/php/lib/Protocol/TMultiplexedProtocol.php
index d579c099d..d579c099d 100644
--- a/lib/php/lib/Thrift/Protocol/TMultiplexedProtocol.php
+++ b/lib/php/lib/Protocol/TMultiplexedProtocol.php
diff --git a/lib/php/lib/Thrift/Protocol/TProtocol.php b/lib/php/lib/Protocol/TProtocol.php
index 0e3bc0d0b..0e3bc0d0b 100644
--- a/lib/php/lib/Thrift/Protocol/TProtocol.php
+++ b/lib/php/lib/Protocol/TProtocol.php
diff --git a/lib/php/lib/Thrift/Protocol/TProtocolDecorator.php b/lib/php/lib/Protocol/TProtocolDecorator.php
index c08c4d505..c08c4d505 100644
--- a/lib/php/lib/Thrift/Protocol/TProtocolDecorator.php
+++ b/lib/php/lib/Protocol/TProtocolDecorator.php
diff --git a/lib/php/lib/Thrift/Protocol/TSimpleJSONProtocol.php b/lib/php/lib/Protocol/TSimpleJSONProtocol.php
index 9cf90bdaa..9cf90bdaa 100644
--- a/lib/php/lib/Thrift/Protocol/TSimpleJSONProtocol.php
+++ b/lib/php/lib/Protocol/TSimpleJSONProtocol.php
diff --git a/lib/php/lib/Thrift/Serializer/TBinarySerializer.php b/lib/php/lib/Serializer/TBinarySerializer.php
index aa2f71b40..aa2f71b40 100644
--- a/lib/php/lib/Thrift/Serializer/TBinarySerializer.php
+++ b/lib/php/lib/Serializer/TBinarySerializer.php
diff --git a/lib/php/lib/Thrift/Server/TForkingServer.php b/lib/php/lib/Server/TForkingServer.php
index 7f6e541cd..7f6e541cd 100644
--- a/lib/php/lib/Thrift/Server/TForkingServer.php
+++ b/lib/php/lib/Server/TForkingServer.php
diff --git a/lib/php/lib/Thrift/Server/TSSLServerSocket.php b/lib/php/lib/Server/TSSLServerSocket.php
index dfc470430..dfc470430 100644
--- a/lib/php/lib/Thrift/Server/TSSLServerSocket.php
+++ b/lib/php/lib/Server/TSSLServerSocket.php
diff --git a/lib/php/lib/Thrift/Server/TServer.php b/lib/php/lib/Server/TServer.php
index f4d76cc15..f4d76cc15 100644
--- a/lib/php/lib/Thrift/Server/TServer.php
+++ b/lib/php/lib/Server/TServer.php
diff --git a/lib/php/lib/Thrift/Server/TServerSocket.php b/lib/php/lib/Server/TServerSocket.php
index da8e22683..da8e22683 100644
--- a/lib/php/lib/Thrift/Server/TServerSocket.php
+++ b/lib/php/lib/Server/TServerSocket.php
diff --git a/lib/php/lib/Thrift/Server/TServerTransport.php b/lib/php/lib/Server/TServerTransport.php
index f82d06d1d..f82d06d1d 100644
--- a/lib/php/lib/Thrift/Server/TServerTransport.php
+++ b/lib/php/lib/Server/TServerTransport.php
diff --git a/lib/php/lib/Thrift/Server/TSimpleServer.php b/lib/php/lib/Server/TSimpleServer.php
index e277700e8..e277700e8 100644
--- a/lib/php/lib/Thrift/Server/TSimpleServer.php
+++ b/lib/php/lib/Server/TSimpleServer.php
diff --git a/lib/php/lib/Thrift/StoredMessageProtocol.php b/lib/php/lib/StoredMessageProtocol.php
index 476d9a685..476d9a685 100644
--- a/lib/php/lib/Thrift/StoredMessageProtocol.php
+++ b/lib/php/lib/StoredMessageProtocol.php
diff --git a/lib/php/lib/Thrift/StringFunc/Core.php b/lib/php/lib/StringFunc/Core.php
index 39a75b3a2..39a75b3a2 100644
--- a/lib/php/lib/Thrift/StringFunc/Core.php
+++ b/lib/php/lib/StringFunc/Core.php
diff --git a/lib/php/lib/Thrift/StringFunc/Mbstring.php b/lib/php/lib/StringFunc/Mbstring.php
index 968ff18f1..968ff18f1 100644
--- a/lib/php/lib/Thrift/StringFunc/Mbstring.php
+++ b/lib/php/lib/StringFunc/Mbstring.php
diff --git a/lib/php/lib/Thrift/StringFunc/TStringFunc.php b/lib/php/lib/StringFunc/TStringFunc.php
index dea497f2e..dea497f2e 100644
--- a/lib/php/lib/Thrift/StringFunc/TStringFunc.php
+++ b/lib/php/lib/StringFunc/TStringFunc.php
diff --git a/lib/php/lib/Thrift/TMultiplexedProcessor.php b/lib/php/lib/TMultiplexedProcessor.php
index 0c2094d0c..0c2094d0c 100644
--- a/lib/php/lib/Thrift/TMultiplexedProcessor.php
+++ b/lib/php/lib/TMultiplexedProcessor.php
diff --git a/lib/php/lib/Thrift/Transport/TBufferedTransport.php b/lib/php/lib/Transport/TBufferedTransport.php
index f654ad3ee..f654ad3ee 100644
--- a/lib/php/lib/Thrift/Transport/TBufferedTransport.php
+++ b/lib/php/lib/Transport/TBufferedTransport.php
diff --git a/lib/php/lib/Thrift/Transport/TCurlClient.php b/lib/php/lib/Transport/TCurlClient.php
index c761cd025..c761cd025 100644
--- a/lib/php/lib/Thrift/Transport/TCurlClient.php
+++ b/lib/php/lib/Transport/TCurlClient.php
diff --git a/lib/php/lib/Thrift/Transport/TFramedTransport.php b/lib/php/lib/Transport/TFramedTransport.php
index b8a64a9a9..b8a64a9a9 100644
--- a/lib/php/lib/Thrift/Transport/TFramedTransport.php
+++ b/lib/php/lib/Transport/TFramedTransport.php
diff --git a/lib/php/lib/Thrift/Transport/THttpClient.php b/lib/php/lib/Transport/THttpClient.php
index b372ab74a..b372ab74a 100644
--- a/lib/php/lib/Thrift/Transport/THttpClient.php
+++ b/lib/php/lib/Transport/THttpClient.php
diff --git a/lib/php/lib/Thrift/Transport/TMemoryBuffer.php b/lib/php/lib/Transport/TMemoryBuffer.php
index ca31c579f..ca31c579f 100644
--- a/lib/php/lib/Thrift/Transport/TMemoryBuffer.php
+++ b/lib/php/lib/Transport/TMemoryBuffer.php
diff --git a/lib/php/lib/Thrift/Transport/TNullTransport.php b/lib/php/lib/Transport/TNullTransport.php
index feeb7a468..feeb7a468 100644
--- a/lib/php/lib/Thrift/Transport/TNullTransport.php
+++ b/lib/php/lib/Transport/TNullTransport.php
diff --git a/lib/php/lib/Thrift/Transport/TPhpStream.php b/lib/php/lib/Transport/TPhpStream.php
index 4c14cdfe1..4c14cdfe1 100644
--- a/lib/php/lib/Thrift/Transport/TPhpStream.php
+++ b/lib/php/lib/Transport/TPhpStream.php
diff --git a/lib/php/lib/Thrift/Transport/TSSLSocket.php b/lib/php/lib/Transport/TSSLSocket.php
index 533b7bbfe..533b7bbfe 100644
--- a/lib/php/lib/Thrift/Transport/TSSLSocket.php
+++ b/lib/php/lib/Transport/TSSLSocket.php
diff --git a/lib/php/lib/Thrift/Transport/TSocket.php b/lib/php/lib/Transport/TSocket.php
index a1872b98b..a1872b98b 100644
--- a/lib/php/lib/Thrift/Transport/TSocket.php
+++ b/lib/php/lib/Transport/TSocket.php
diff --git a/lib/php/lib/Thrift/Transport/TSocketPool.php b/lib/php/lib/Transport/TSocketPool.php
index 18ffd8d94..18ffd8d94 100644
--- a/lib/php/lib/Thrift/Transport/TSocketPool.php
+++ b/lib/php/lib/Transport/TSocketPool.php
diff --git a/lib/php/lib/Thrift/Transport/TTransport.php b/lib/php/lib/Transport/TTransport.php
index 99c39ff37..99c39ff37 100644
--- a/lib/php/lib/Thrift/Transport/TTransport.php
+++ b/lib/php/lib/Transport/TTransport.php
diff --git a/lib/php/lib/Thrift/Type/TConstant.php b/lib/php/lib/Type/TConstant.php
index 7c8eceb03..7c8eceb03 100644
--- a/lib/php/lib/Thrift/Type/TConstant.php
+++ b/lib/php/lib/Type/TConstant.php
diff --git a/lib/php/lib/Thrift/Type/TMessageType.php b/lib/php/lib/Type/TMessageType.php
index bff224f88..bff224f88 100644
--- a/lib/php/lib/Thrift/Type/TMessageType.php
+++ b/lib/php/lib/Type/TMessageType.php
diff --git a/lib/php/lib/Thrift/Type/TType.php b/lib/php/lib/Type/TType.php
index 71219c249..71219c249 100644
--- a/lib/php/lib/Thrift/Type/TType.php
+++ b/lib/php/lib/Type/TType.php
diff --git a/lib/php/test/Test/Thrift/Fixtures.php b/lib/php/test/Fixtures.php
index 2c60a08f9..2c60a08f9 100644
--- a/lib/php/test/Test/Thrift/Fixtures.php
+++ b/lib/php/test/Fixtures.php
diff --git a/lib/php/test/Test/Thrift/JsonSerialize/JsonSerializeTest.php b/lib/php/test/JsonSerialize/JsonSerializeTest.php
index a6b0e7b81..dfb34c3b7 100644
--- a/lib/php/test/Test/Thrift/JsonSerialize/JsonSerializeTest.php
+++ b/lib/php/test/JsonSerialize/JsonSerializeTest.php
@@ -23,10 +23,10 @@ namespace Test\Thrift\JsonSerialize;
 use stdClass;
 use Thrift\ClassLoader\ThriftClassLoader;
 
-require_once __DIR__.'/../../../../../../vendor/autoload.php';
+require_once __DIR__.'/../../../../vendor/autoload.php';
 
 $loader = new ThriftClassLoader();
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages/phpjs');
+$loader->registerDefinition('ThriftTest', __DIR__ . '/../packages/phpjs');
 $loader->register();
 
 class JsonSerializeTest extends \PHPUnit_Framework_TestCase
diff --git a/lib/php/test/Makefile.am b/lib/php/test/Makefile.am
index c4dcde342..5658afa26 100755
--- a/lib/php/test/Makefile.am
+++ b/lib/php/test/Makefile.am
@@ -35,16 +35,16 @@ deps: $(top_srcdir)/composer.json
 all-local: deps
 
 check-json-serializer: deps stubs
-	$(PHPUNIT) --log-junit=TEST-json-serializer.xml Test/Thrift/JsonSerialize/
+	$(PHPUNIT) --log-junit=TEST-json-serializer.xml JsonSerialize/
 
 check-validator: deps stubs
-	php Test/Thrift/TestValidators.php
-	php Test/Thrift/TestValidators.php -oop
+	php TestValidators.php
+	php TestValidators.php -oop
 
 check-protocol:	deps stubs
-	$(PHPUNIT) --log-junit=TEST-log-json-protocol.xml Test/Thrift/Protocol/TestTJSONProtocol.php
-	$(PHPUNIT) --log-junit=TEST-binary-serializer.xml Test/Thrift/Protocol/TestBinarySerializer.php
-	$(PHPUNIT) --log-junit=TEST-log-simple-json-protocol.xml Test/Thrift/Protocol/TestTSimpleJSONProtocol.php
+	$(PHPUNIT) --log-junit=TEST-log-json-protocol.xml Protocol/TestTJSONProtocol.php
+	$(PHPUNIT) --log-junit=TEST-binary-serializer.xml Protocol/TestBinarySerializer.php
+	$(PHPUNIT) --log-junit=TEST-log-simple-json-protocol.xml Protocol/TestTSimpleJSONProtocol.php
 
 check: deps stubs \
   check-protocol \
@@ -54,7 +54,3 @@ check: deps stubs \
 clean-local:
 	$(RM) -r ./packages
 	$(RM) TEST-*.xml
-
-EXTRA_DIST = \
-	Test \
-	TestValidators.thrift
diff --git a/lib/php/test/Test/Thrift/Protocol/TestBinarySerializer.php b/lib/php/test/Protocol/TestBinarySerializer.php
index b30cf3d85..e08057b4f 100644
--- a/lib/php/test/Test/Thrift/Protocol/TestBinarySerializer.php
+++ b/lib/php/test/Protocol/TestBinarySerializer.php
@@ -26,10 +26,10 @@ namespace Test\Thrift\Protocol;
 use Thrift\ClassLoader\ThriftClassLoader;
 use Thrift\Serializer\TBinarySerializer;
 
-require_once __DIR__.'/../../../../../../vendor/autoload.php';
+require_once __DIR__.'/../../../../vendor/autoload.php';
 
 $loader = new ThriftClassLoader();
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages');
+$loader->registerDefinition('ThriftTest', __DIR__ . '/../packages');
 $loader->register();
 
 /***
diff --git a/lib/php/test/Test/Thrift/Protocol/TestTJSONProtocol.php b/lib/php/test/Protocol/TestTJSONProtocol.php
index a41b0814c..1c34efb99 100644
--- a/lib/php/test/Test/Thrift/Protocol/TestTJSONProtocol.php
+++ b/lib/php/test/Protocol/TestTJSONProtocol.php
@@ -30,10 +30,10 @@ use Thrift\Protocol\TJSONProtocol;
 
 define( 'BUFSIZ', 8192 ); //big enough to read biggest serialized Fixture arg.
 
-require_once __DIR__.'/../../../../../../vendor/autoload.php';
+require_once __DIR__.'/../../../../vendor/autoload.php';
 
 $loader = new ThriftClassLoader();
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages');
+$loader->registerDefinition('ThriftTest', __DIR__ . '/../packages');
 $loader->register();
 
 /***
diff --git a/lib/php/test/Test/Thrift/Protocol/TestTSimpleJSONProtocol.php b/lib/php/test/Protocol/TestTSimpleJSONProtocol.php
index 5a8e9e69a..1f696a5bc 100644
--- a/lib/php/test/Test/Thrift/Protocol/TestTSimpleJSONProtocol.php
+++ b/lib/php/test/Protocol/TestTSimpleJSONProtocol.php
@@ -30,10 +30,10 @@ use Thrift\Protocol\TSimpleJSONProtocol;
 
 define( 'BUFSIZ', 8192 ); //big enough to read biggest serialized Fixture arg.
 
-require_once __DIR__.'/../../../../../../vendor/autoload.php';
+require_once __DIR__.'/../../../../vendor/autoload.php';
 
 $loader = new ThriftClassLoader();
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../../packages');
+$loader->registerDefinition('ThriftTest', __DIR__ . '/../packages');
 $loader->register();
 
 /***
diff --git a/lib/php/test/Test/Thrift/TestValidators.php b/lib/php/test/TestValidators.php
index a6c13c59f..84c01f896 100644
--- a/lib/php/test/Test/Thrift/TestValidators.php
+++ b/lib/php/test/TestValidators.php
@@ -18,9 +18,9 @@
  * under the License.
  */
 
-namespace Test\Thrift;
+namespace test\Thrift;
 
-require_once __DIR__.'/../../../../../vendor/autoload.php';
+require_once __DIR__.'/../../../vendor/autoload.php';
 
 use Thrift\ClassLoader\ThriftClassLoader;
 use Thrift\Exception\TProtocolException;
@@ -31,8 +31,8 @@ $oop_mode = (isset($argv[1]) && $argv[1] === '-oop');
 $GEN_DIR = $oop_mode ? 'phpvo' : 'phpv';
 
 $loader = new ThriftClassLoader();
-$loader->registerDefinition('ThriftTest', __DIR__ . '/../../packages/' . $GEN_DIR);
-$loader->registerDefinition('TestValidators', __DIR__ . '/../../packages/' . $GEN_DIR);
+$loader->registerDefinition('ThriftTest', __DIR__ . '/packages/' . $GEN_DIR);
+$loader->registerDefinition('TestValidators', __DIR__ . '/packages/' . $GEN_DIR);
 $loader->register();
 
 // Would be nice to have PHPUnit here, but for now just hack it.
diff --git a/tutorial/php/PhpClient.php b/tutorial/php/PhpClient.php
index d262b8fe9..92dc3cbac 100755
--- a/tutorial/php/PhpClient.php
+++ b/tutorial/php/PhpClient.php
@@ -5,7 +5,7 @@ namespace tutorial\php;
 
 error_reporting(E_ALL);
 
-require_once __DIR__.'/../../lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php';
+require_once __DIR__.'/../../lib/php/lib/ClassLoader/ThriftClassLoader.php';
 
 use Thrift\ClassLoader\ThriftClassLoader;
 
diff --git a/tutorial/php/PhpServer.php b/tutorial/php/PhpServer.php
index 22ae43eb8..5a9b49bde 100755
--- a/tutorial/php/PhpServer.php
+++ b/tutorial/php/PhpServer.php
@@ -5,7 +5,7 @@ namespace tutorial\php;
 
 error_reporting(E_ALL);
 
-require_once __DIR__.'/../../lib/php/lib/Thrift/ClassLoader/ThriftClassLoader.php';
+require_once __DIR__.'/../../lib/php/lib/ClassLoader/ThriftClassLoader.php';
 
 use Thrift\ClassLoader\ThriftClassLoader;