diff --git a/.gitignore b/.gitignore
index 766a0f4cc0c64a45a32fec639dc3b4fecb78ebc9..d5a19cbdb3e753e6b3367610bf5462c36b790da9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,3 +20,5 @@ doc/html
 *.egg-info
 *.pyc
 doc/.build
+*.pyd
+*.so
diff --git a/src/python/__init__.py b/meshpy/__init__.py
similarity index 100%
rename from src/python/__init__.py
rename to meshpy/__init__.py
diff --git a/src/python/common.py b/meshpy/common.py
similarity index 100%
rename from src/python/common.py
rename to meshpy/common.py
diff --git a/src/python/geometry.py b/meshpy/geometry.py
similarity index 100%
rename from src/python/geometry.py
rename to meshpy/geometry.py
diff --git a/src/python/ply.py b/meshpy/ply.py
similarity index 100%
rename from src/python/ply.py
rename to meshpy/ply.py
diff --git a/src/python/tet.py b/meshpy/tet.py
similarity index 100%
rename from src/python/tet.py
rename to meshpy/tet.py
diff --git a/src/python/triangle.py b/meshpy/triangle.py
similarity index 100%
rename from src/python/triangle.py
rename to meshpy/triangle.py
diff --git a/setup.py b/setup.py
index 6fcddce88f7b997c257f6c1eb1fb61f5651fe56e..292b9eb96890e4f57bbd34198799c5ab431195ac 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ def main():
     LIBRARY_DIRS = conf["BOOST_LIB_DIR"]
     LIBRARIES = conf["BOOST_PYTHON_LIBNAME"]
 
-    execfile("src/python/__init__.py", conf)
+    execfile("meshpy/__init__.py", conf)
     setup(name="MeshPy",
           version=conf["version"],
           description="Triangular and Tetrahedral Mesh Generator",
@@ -88,7 +88,6 @@ def main():
             ],
 
           packages = [ "meshpy" ],
-          package_dir={"meshpy": "src/python"},
           ext_modules = [
             Extension(
               "meshpy._triangle",