diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index e65bd31..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,2 +0,0 @@
-include helloWorld.py
-include helloWorld.plug
diff --git a/setup.py b/setup.py
index 26fd7d5..838205c 100644
--- a/setup.py
+++ b/setup.py
@@ -2,10 +2,16 @@
 
 setup(
     name="errbot-plugin-helloworld",
-    version="1.0",
+    version="1.1",
     description="Errbot HelloWorld plugin",
     author="Errbot",
-    packages=find_packages(),
+    packages=find_packages(where="src"),
+    package_dir={'': 'src'},
+    package_data={
+        "helloworld": [
+            "*.plug",
+        ],
+    },
     include_package_data=True,
     entry_points={
         "errbot.plugins": [
diff --git a/src/helloworld/__init__.py b/src/helloworld/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/helloWorld.plug b/src/helloworld/helloWorld.plug
similarity index 100%
rename from helloWorld.plug
rename to src/helloworld/helloWorld.plug
diff --git a/helloWorld.py b/src/helloworld/helloWorld.py
similarity index 100%
rename from helloWorld.py
rename to src/helloworld/helloWorld.py