diff --git a/.gitignore b/.gitignore
index 225fc6f..017ca70 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,19 @@
 /__pycache__
+*.py[cod]
+*$py.class
+
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+*.egg-info/
+.installed.cfg
+*.egg
+
+.ropeproject
diff --git a/setup.py b/setup.py
index 5e16893..90e1ea1 100644
--- a/setup.py
+++ b/setup.py
@@ -18,6 +18,7 @@
 setup(
     name="xmpp-http-upload",
     version="0.3.0",
+    packages=find_packages(),
     description="Flask-based HTTP service to handle XMPP HTTP upload requests from Prosody mod_http_upload_external",
     long_description=long_description,
     url="https://github.com/horazont/xmpp-http-upload",
diff --git a/xmpp_http_upload/__init__.py b/xmpp_http_upload/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/xhu.py b/xmpp_http_upload/xhu.py
similarity index 100%
rename from xhu.py
rename to xmpp_http_upload/xhu.py