diff --git a/.gitignore b/.gitignore
index 756e697..5b33aea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 *.swp
 build/
 dist/
-src/py65.egg-info/
+py65.egg-info/
diff --git a/src/py65/__init__.py b/py65/__init__.py
similarity index 100%
rename from src/py65/__init__.py
rename to py65/__init__.py
diff --git a/src/py65/assembler.py b/py65/assembler.py
similarity index 100%
rename from src/py65/assembler.py
rename to py65/assembler.py
diff --git a/src/py65/devices/__init__.py b/py65/devices/__init__.py
similarity index 100%
rename from src/py65/devices/__init__.py
rename to py65/devices/__init__.py
diff --git a/src/py65/devices/mpu6502.py b/py65/devices/mpu6502.py
similarity index 100%
rename from src/py65/devices/mpu6502.py
rename to py65/devices/mpu6502.py
diff --git a/src/py65/devices/mpu65c02.py b/py65/devices/mpu65c02.py
similarity index 100%
rename from src/py65/devices/mpu65c02.py
rename to py65/devices/mpu65c02.py
diff --git a/src/py65/devices/mpu65org16.py b/py65/devices/mpu65org16.py
similarity index 100%
rename from src/py65/devices/mpu65org16.py
rename to py65/devices/mpu65org16.py
diff --git a/src/py65/disassembler.py b/py65/disassembler.py
similarity index 100%
rename from src/py65/disassembler.py
rename to py65/disassembler.py
diff --git a/src/py65/memory.py b/py65/memory.py
similarity index 100%
rename from src/py65/memory.py
rename to py65/memory.py
diff --git a/src/py65/monitor.py b/py65/monitor.py
similarity index 100%
rename from src/py65/monitor.py
rename to py65/monitor.py
diff --git a/src/py65/tests/__init__.py b/py65/tests/__init__.py
similarity index 100%
rename from src/py65/tests/__init__.py
rename to py65/tests/__init__.py
diff --git a/src/py65/tests/devices/__init__.py b/py65/tests/devices/__init__.py
similarity index 100%
rename from src/py65/tests/devices/__init__.py
rename to py65/tests/devices/__init__.py
diff --git a/src/py65/tests/devices/test_mpu6502.py b/py65/tests/devices/test_mpu6502.py
similarity index 100%
rename from src/py65/tests/devices/test_mpu6502.py
rename to py65/tests/devices/test_mpu6502.py
diff --git a/src/py65/tests/devices/test_mpu65c02.py b/py65/tests/devices/test_mpu65c02.py
similarity index 100%
rename from src/py65/tests/devices/test_mpu65c02.py
rename to py65/tests/devices/test_mpu65c02.py
diff --git a/src/py65/tests/test_assembler.py b/py65/tests/test_assembler.py
similarity index 100%
rename from src/py65/tests/test_assembler.py
rename to py65/tests/test_assembler.py
diff --git a/src/py65/tests/test_disassembler.py b/py65/tests/test_disassembler.py
similarity index 100%
rename from src/py65/tests/test_disassembler.py
rename to py65/tests/test_disassembler.py
diff --git a/src/py65/tests/test_memory.py b/py65/tests/test_memory.py
similarity index 100%
rename from src/py65/tests/test_memory.py
rename to py65/tests/test_memory.py
diff --git a/src/py65/tests/test_monitor.py b/py65/tests/test_monitor.py
similarity index 100%
rename from src/py65/tests/test_monitor.py
rename to py65/tests/test_monitor.py
diff --git a/src/py65/tests/utils/__init__.py b/py65/tests/utils/__init__.py
similarity index 100%
rename from src/py65/tests/utils/__init__.py
rename to py65/tests/utils/__init__.py
diff --git a/src/py65/tests/utils/test_addressing.py b/py65/tests/utils/test_addressing.py
similarity index 100%
rename from src/py65/tests/utils/test_addressing.py
rename to py65/tests/utils/test_addressing.py
diff --git a/src/py65/tests/utils/test_console.py b/py65/tests/utils/test_console.py
similarity index 100%
rename from src/py65/tests/utils/test_console.py
rename to py65/tests/utils/test_console.py
diff --git a/src/py65/tests/utils/test_conversions.py b/py65/tests/utils/test_conversions.py
similarity index 100%
rename from src/py65/tests/utils/test_conversions.py
rename to py65/tests/utils/test_conversions.py
diff --git a/src/py65/tests/utils/test_hexdump.py b/py65/tests/utils/test_hexdump.py
similarity index 100%
rename from src/py65/tests/utils/test_hexdump.py
rename to py65/tests/utils/test_hexdump.py
diff --git a/src/py65/utils/__init__.py b/py65/utils/__init__.py
similarity index 100%
rename from src/py65/utils/__init__.py
rename to py65/utils/__init__.py
diff --git a/src/py65/utils/addressing.py b/py65/utils/addressing.py
similarity index 100%
rename from src/py65/utils/addressing.py
rename to py65/utils/addressing.py
diff --git a/src/py65/utils/console.py b/py65/utils/console.py
similarity index 100%
rename from src/py65/utils/console.py
rename to py65/utils/console.py
diff --git a/src/py65/utils/conversions.py b/py65/utils/conversions.py
similarity index 100%
rename from src/py65/utils/conversions.py
rename to py65/utils/conversions.py
diff --git a/src/py65/utils/devices.py b/py65/utils/devices.py
similarity index 100%
rename from src/py65/utils/devices.py
rename to py65/utils/devices.py
diff --git a/src/py65/utils/hexdump.py b/py65/utils/hexdump.py
similarity index 100%
rename from src/py65/utils/hexdump.py
rename to py65/utils/hexdump.py
diff --git a/setup.py b/setup.py
index 4a2151a..ac09cdd 100644
--- a/setup.py
+++ b/setup.py
@@ -44,8 +44,7 @@ setup(
     author_email = "mike@naberezny.com",
     maintainer = "Mike Naberezny",
     maintainer_email = "mike@naberezny.com",
-    package_dir = {'':'src'},
-    packages = find_packages(os.path.join(here, 'src')),
+    packages = find_packages(),
     install_requires = [],
     extras_require = {},
     tests_require = [],