diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..da75e1c
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+dist/
+build/
+buildno
+*.egg-info/
\ No newline at end of file
diff --git a/setup.py b/setup.py
index 3fa7933..00649d0 100644
--- a/setup.py
+++ b/setup.py
@@ -1,8 +1,9 @@
-from distutils.core import setup, Extension
 from json import load, dump
 import os
+import setuptools
+from setuptools import setup, Extension
 
-module1 = Extension('py3dutil', sources = ['py3dutil.c', 'obarr.c', 'red_black_tree.c', 'misc.c', 'vect.c', 'quat.c'])
+module1 = Extension('py3dutil', sources = ['src/' + x for x in ['py3dutil.c', 'obarr.c', 'red_black_tree.c', 'misc.c', 'vect.c', 'quat.c']])
 
 buildno = 0
 if os.path.exists('buildno'):
@@ -11,12 +12,13 @@ if os.path.exists('buildno'):
 dump({'build': buildno}, open('buildno', 'w'))
 
 setup (name = 'py3dutil',
-	version = '0.3.%.4d' % (buildno,),
+	version = '0.3.%.d' % (buildno,),
 	description = 'Accelerator library for 3d games',
 	author = 'Bradley Lawrence',
 	author_email = 'py3dutil@iambitter.org',
 	long_description = '''
 Does arrays, vectors, and collision. Does them fast. Oh my yes.
 ''',
+	packages=setuptools.find_packages(),
 	ext_modules = [module1])
 
diff --git a/cgrid.c b/src/cgrid.c
similarity index 100%
rename from cgrid.c
rename to src/cgrid.c
diff --git a/cgrid.h b/src/cgrid.h
similarity index 100%
rename from cgrid.h
rename to src/cgrid.h
diff --git a/collision.c b/src/collision.c
similarity index 100%
rename from collision.c
rename to src/collision.c
diff --git a/collision.h b/src/collision.h
similarity index 100%
rename from collision.h
rename to src/collision.h
diff --git a/misc.c b/src/misc.c
similarity index 100%
rename from misc.c
rename to src/misc.c
diff --git a/misc.h b/src/misc.h
similarity index 100%
rename from misc.h
rename to src/misc.h
diff --git a/obarr.c b/src/obarr.c
similarity index 100%
rename from obarr.c
rename to src/obarr.c
diff --git a/obarr.h b/src/obarr.h
similarity index 100%
rename from obarr.h
rename to src/obarr.h
diff --git a/pos.c b/src/pos.c
similarity index 100%
rename from pos.c
rename to src/pos.c
diff --git a/pos.h b/src/pos.h
similarity index 100%
rename from pos.h
rename to src/pos.h
diff --git a/py3dutil.c b/src/py3dutil.c
similarity index 100%
rename from py3dutil.c
rename to src/py3dutil.c
diff --git a/quat.c b/src/quat.c
similarity index 100%
rename from quat.c
rename to src/quat.c
diff --git a/quat.h b/src/quat.h
similarity index 100%
rename from quat.h
rename to src/quat.h
diff --git a/red_black_tree.c b/src/red_black_tree.c
similarity index 100%
rename from red_black_tree.c
rename to src/red_black_tree.c
diff --git a/red_black_tree.h b/src/red_black_tree.h
similarity index 100%
rename from red_black_tree.h
rename to src/red_black_tree.h
diff --git a/vect.c b/src/vect.c
similarity index 100%
rename from vect.c
rename to src/vect.c
diff --git a/vect.h b/src/vect.h
similarity index 100%
rename from vect.h
rename to src/vect.h