diff --git a/mumble-music-bot/__init__.py b/mumbledj/__init__.py
similarity index 100%
rename from mumble-music-bot/__init__.py
rename to mumbledj/__init__.py
diff --git a/mumble-music-bot/config.py b/mumbledj/config.py
similarity index 100%
rename from mumble-music-bot/config.py
rename to mumbledj/config.py
diff --git a/mumble-music-bot/musicbot.py b/mumbledj/musicbot.py
similarity index 100%
rename from mumble-music-bot/musicbot.py
rename to mumbledj/musicbot.py
diff --git a/mumbledj/pymumble/.gitignore b/mumbledj/pymumble/.gitignore
new file mode 100644
index 0000000..2f7fed6
--- /dev/null
+++ b/mumbledj/pymumble/.gitignore
@@ -0,0 +1,63 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+env/
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+*.egg-info/
+.installed.cfg
+*.egg
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.coverage
+.cache
+nosetests.xml
+coverage.xml
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# pymumble files
+pycelt/
+pyopus/
+*.py
+mumble.proto
+TODO
+LICENSE
+API.md
diff --git a/pymumble/README.md b/mumbledj/pymumble/README.md
similarity index 100%
rename from pymumble/README.md
rename to mumbledj/pymumble/README.md