diff --git a/.gitignore b/.gitignore
index ae0ab4221..e46140096 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,7 +23,6 @@ supybot.egg-info/
 test-conf/
 test-data/
 test-logs/
-src/version.py
 INSTALL
 README.txt
 conf/
diff --git a/Makefile b/Makefile
index 19543d69e..eb1fed5b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-PYTHON=`which python`
+PYTHON=`which python3`
 DESTDIR=/
 PROJECT=limnoria
 
@@ -10,6 +10,9 @@ all:
 	@echo "make builddeb_py3 - Generate a deb package for Python 3"
 	@echo "make clean - Get rid of scratch and byte files"
 
+test:
+	PATH=./scripts/:${PATH} PYTHONPATH=. $(PYTHON) ./scripts/supybot-test test --plugins-dir=plugins/
+
 source:
 	$(PYTHON) setup.py sdist $(COMPILE)
 
@@ -35,4 +38,5 @@ clean:
 	rm -rf build/ MANIFEST
 	find . -name '*.pyc' -delete
 	rm debian/control
-	
+
+.PHONY: test
diff --git a/setup.py b/setup.py
index 658fb8025..b0cfb6162 100644
--- a/setup.py
+++ b/setup.py
@@ -147,19 +147,9 @@ packages = ['supybot',
              'supybot.plugins.Math.local',
             ]
 
-package_dir = {'supybot': 'src',
-               'supybot.utils': 'src/utils',
-               'supybot.locales': 'locales',
-               'supybot.plugins': 'plugins',
-               'supybot.drivers': 'src/drivers',
-               'supybot.plugins.Dict.local': 'plugins/Dict/local',
-               'supybot.plugins.Math.local': 'plugins/Math/local',
-              }
-
-package_data = {'supybot.locales': [s for s in os.listdir('locales/')]}
+package_data = {'supybot.locales': [s for s in os.listdir('supybot/locales/')]}
 
 for plugin in plugins:
-    package_dir['supybot.plugins.' + plugin] = 'plugins/' + plugin
     locales_path = 'plugins/' + plugin + '/locales/'
     locales_name = 'supybot.plugins.'+plugin
     if os.path.exists(locales_path):
@@ -210,8 +200,6 @@ setup(
     # Installation data
     packages=packages,
 
-    package_dir=package_dir,
-
     package_data=package_data,
 
     scripts=['scripts/supybot',
diff --git a/locales/__init__.py b/src/locales/__init__.py
similarity index 100%
rename from locales/__init__.py
rename to src/locales/__init__.py
diff --git a/locales/de.po b/src/locales/de.po
similarity index 100%
rename from locales/de.po
rename to src/locales/de.po
diff --git a/locales/fi.po b/src/locales/fi.po
similarity index 100%
rename from locales/fi.po
rename to src/locales/fi.po
diff --git a/locales/fr.po b/src/locales/fr.po
similarity index 100%
rename from locales/fr.po
rename to src/locales/fr.po
diff --git a/locales/fr.py b/src/locales/fr.py
similarity index 100%
rename from locales/fr.py
rename to src/locales/fr.py
diff --git a/locales/it.po b/src/locales/it.po
similarity index 100%
rename from locales/it.po
rename to src/locales/it.po
diff --git a/locales/messages.pot b/src/locales/messages.pot
similarity index 100%
rename from locales/messages.pot
rename to src/locales/messages.pot
diff --git a/src/plugins b/src/plugins
new file mode 120000
index 000000000..7655edcc0
--- /dev/null
+++ b/src/plugins
@@ -0,0 +1 @@
+../plugins
\ No newline at end of file
diff --git a/supybot b/supybot
new file mode 120000
index 000000000..e8310385c
--- /dev/null
+++ b/supybot
@@ -0,0 +1 @@
+src
\ No newline at end of file