diff --git a/python/setup.py b/setup.py
similarity index 81%
rename from python/setup.py
rename to setup.py
index 370f3ef..ae3a1d4 100644
--- a/python/setup.py
+++ b/setup.py
@@ -43,18 +43,9 @@
 if sys.platform == "win32":
     libs.append("ws2_32")
 
-shutil.copy("../Client.h", "./")
-shutil.copy("../mcdefs.h", "./")
-shutil.copy("../PacketWriter.h", "./")
-shutil.copy("../PacketReader.h", "./")
-shutil.copy("../socketdefs.h", "./")
-shutil.copy("../PacketWriter.cpp", "./")
-shutil.copy("../PacketReader.cpp", "./")
-shutil.copy("../Client.cpp", "./")
-
 module1 = Extension('umemcached',
-                sources = ['umemcached.cpp', 'PacketReader.cpp', 'PacketWriter.cpp', 'Client.cpp'],
-                include_dirs = ['./'],
+                sources = ['umemcached.cpp', 'src/PacketReader.cpp', 'src/PacketWriter.cpp', 'src/Client.cpp'],
+                include_dirs = ['src/'],
                 library_dirs = [],
                 libraries=libs,
                 define_macros=[('WIN32_LEAN_AND_MEAN', None)])
diff --git a/Client.cpp b/src/Client.cpp
similarity index 100%
rename from Client.cpp
rename to src/Client.cpp
diff --git a/Client.h b/src/Client.h
similarity index 100%
rename from Client.h
rename to src/Client.h
diff --git a/PacketReader.cpp b/src/PacketReader.cpp
similarity index 100%
rename from PacketReader.cpp
rename to src/PacketReader.cpp
diff --git a/PacketReader.h b/src/PacketReader.h
similarity index 100%
rename from PacketReader.h
rename to src/PacketReader.h
diff --git a/PacketWriter.cpp b/src/PacketWriter.cpp
similarity index 100%
rename from PacketWriter.cpp
rename to src/PacketWriter.cpp
diff --git a/PacketWriter.h b/src/PacketWriter.h
similarity index 100%
rename from PacketWriter.h
rename to src/PacketWriter.h
diff --git a/mcdefs.h b/src/mcdefs.h
similarity index 100%
rename from mcdefs.h
rename to src/mcdefs.h
diff --git a/socketdefs.h b/src/socketdefs.h
similarity index 100%
rename from socketdefs.h
rename to src/socketdefs.h
diff --git a/python/tests.py b/tests.py
similarity index 100%
rename from python/tests.py
rename to tests.py
diff --git a/python/umemcached.cpp b/umemcached.cpp
similarity index 100%
rename from python/umemcached.cpp
rename to umemcached.cpp