diff --git a/lib/cpp/Makefile b/lib/cpp/Makefile
index f77c493..15664fa 100644
--- a/lib/cpp/Makefile
+++ b/lib/cpp/Makefile
@@ -12,14 +12,14 @@
 
 # Tools
 LD    = g++
-LDFL  = -shared -Wall -I. -fPIC -Wl,-soname=libthrift.so
+LDFL  = -shared -Wall -Isrc -fPIC -Wl,-soname=libthrift.so
 
 # Source files
-SRCS  = protocol/TBinaryProtocol.cc \
-	transport/TBufferedTransport.cc \
-	transport/TSocket.cc \
-	transport/TServerSocket.cc \
-	server/TSimpleServer.cc
+SRCS  = src/protocol/TBinaryProtocol.cc \
+	src/transport/TBufferedTransport.cc \
+	src/transport/TSocket.cc \
+	src/transport/TServerSocket.cc \
+	src/server/TSimpleServer.cc
 
 # Linked library
 libthrift:
diff --git a/lib/cpp/TProcessor.h b/lib/cpp/src/TProcessor.h
similarity index 100%
rename from lib/cpp/TProcessor.h
rename to lib/cpp/src/TProcessor.h
diff --git a/lib/cpp/Thrift.h b/lib/cpp/src/Thrift.h
similarity index 100%
rename from lib/cpp/Thrift.h
rename to lib/cpp/src/Thrift.h
diff --git a/lib/cpp/protocol/TBinaryProtocol.cc b/lib/cpp/src/protocol/TBinaryProtocol.cc
similarity index 100%
rename from lib/cpp/protocol/TBinaryProtocol.cc
rename to lib/cpp/src/protocol/TBinaryProtocol.cc
diff --git a/lib/cpp/protocol/TBinaryProtocol.h b/lib/cpp/src/protocol/TBinaryProtocol.h
similarity index 100%
rename from lib/cpp/protocol/TBinaryProtocol.h
rename to lib/cpp/src/protocol/TBinaryProtocol.h
diff --git a/lib/cpp/protocol/TProtocol.h b/lib/cpp/src/protocol/TProtocol.h
similarity index 100%
rename from lib/cpp/protocol/TProtocol.h
rename to lib/cpp/src/protocol/TProtocol.h
diff --git a/lib/cpp/server/TServer.h b/lib/cpp/src/server/TServer.h
similarity index 100%
rename from lib/cpp/server/TServer.h
rename to lib/cpp/src/server/TServer.h
diff --git a/lib/cpp/server/TSimpleServer.cc b/lib/cpp/src/server/TSimpleServer.cc
similarity index 100%
rename from lib/cpp/server/TSimpleServer.cc
rename to lib/cpp/src/server/TSimpleServer.cc
diff --git a/lib/cpp/server/TSimpleServer.h b/lib/cpp/src/server/TSimpleServer.h
similarity index 100%
rename from lib/cpp/server/TSimpleServer.h
rename to lib/cpp/src/server/TSimpleServer.h
diff --git a/lib/cpp/transport/TBufferedTransport.cc b/lib/cpp/src/transport/TBufferedTransport.cc
similarity index 100%
rename from lib/cpp/transport/TBufferedTransport.cc
rename to lib/cpp/src/transport/TBufferedTransport.cc
diff --git a/lib/cpp/transport/TBufferedTransport.h b/lib/cpp/src/transport/TBufferedTransport.h
similarity index 100%
rename from lib/cpp/transport/TBufferedTransport.h
rename to lib/cpp/src/transport/TBufferedTransport.h
diff --git a/lib/cpp/transport/TNullTransport.h b/lib/cpp/src/transport/TNullTransport.h
similarity index 100%
rename from lib/cpp/transport/TNullTransport.h
rename to lib/cpp/src/transport/TNullTransport.h
diff --git a/lib/cpp/transport/TServerSocket.cc b/lib/cpp/src/transport/TServerSocket.cc
similarity index 100%
rename from lib/cpp/transport/TServerSocket.cc
rename to lib/cpp/src/transport/TServerSocket.cc
diff --git a/lib/cpp/transport/TServerSocket.h b/lib/cpp/src/transport/TServerSocket.h
similarity index 100%
rename from lib/cpp/transport/TServerSocket.h
rename to lib/cpp/src/transport/TServerSocket.h
diff --git a/lib/cpp/transport/TServerTransport.h b/lib/cpp/src/transport/TServerTransport.h
similarity index 100%
rename from lib/cpp/transport/TServerTransport.h
rename to lib/cpp/src/transport/TServerTransport.h
diff --git a/lib/cpp/transport/TSocket.cc b/lib/cpp/src/transport/TSocket.cc
similarity index 100%
rename from lib/cpp/transport/TSocket.cc
rename to lib/cpp/src/transport/TSocket.cc
diff --git a/lib/cpp/transport/TSocket.h b/lib/cpp/src/transport/TSocket.h
similarity index 100%
rename from lib/cpp/transport/TSocket.h
rename to lib/cpp/src/transport/TSocket.h
diff --git a/lib/cpp/transport/TTransport.h b/lib/cpp/src/transport/TTransport.h
similarity index 100%
rename from lib/cpp/transport/TTransport.h
rename to lib/cpp/src/transport/TTransport.h
diff --git a/lib/cpp/transport/TTransportException.h b/lib/cpp/src/transport/TTransportException.h
similarity index 100%
rename from lib/cpp/transport/TTransportException.h
rename to lib/cpp/src/transport/TTransportException.h