diff --git a/setup.py b/setup.py
index 6c0b1fa..258d4c3 100644
--- a/setup.py
+++ b/setup.py
@@ -16,7 +16,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 setup(
     name="vboxwrapper",
@@ -27,9 +27,10 @@
     author_email="package-maintainer@gns3.net",
     description="Script to control VirtualBox on Linux/Unix",
     long_description=open("README.md", "r").read(),
+    packages=find_packages(),
     entry_points={
         "console_scripts": [
-            "vboxwrapper = vboxwrapper:main",
+            "vboxwrapper = vboxwrapper.vboxwrapper:main",
             ]
         },
     platforms="any",
diff --git a/adapters/__init__.py b/vboxwrapper/__init__.py
similarity index 100%
rename from adapters/__init__.py
rename to vboxwrapper/__init__.py
diff --git a/nios/__init__.py b/vboxwrapper/adapters/__init__.py
similarity index 100%
rename from nios/__init__.py
rename to vboxwrapper/adapters/__init__.py
diff --git a/adapters/adapter.py b/vboxwrapper/adapters/adapter.py
similarity index 100%
rename from adapters/adapter.py
rename to vboxwrapper/adapters/adapter.py
diff --git a/adapters/ethernet_adapter.py b/vboxwrapper/adapters/ethernet_adapter.py
similarity index 100%
rename from adapters/ethernet_adapter.py
rename to vboxwrapper/adapters/ethernet_adapter.py
diff --git a/vboxwrapper/nios/__init__.py b/vboxwrapper/nios/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/nios/nio.py b/vboxwrapper/nios/nio.py
similarity index 100%
rename from nios/nio.py
rename to vboxwrapper/nios/nio.py
diff --git a/nios/nio_udp.py b/vboxwrapper/nios/nio_udp.py
similarity index 100%
rename from nios/nio_udp.py
rename to vboxwrapper/nios/nio_udp.py
diff --git a/tcp_pipe_proxy.py b/vboxwrapper/tcp_pipe_proxy.py
similarity index 100%
rename from tcp_pipe_proxy.py
rename to vboxwrapper/tcp_pipe_proxy.py
diff --git a/vboxwrapper.py b/vboxwrapper/vboxwrapper.py
similarity index 100%
rename from vboxwrapper.py
rename to vboxwrapper/vboxwrapper.py
diff --git a/virtualbox_controller.py b/vboxwrapper/virtualbox_controller.py
similarity index 100%
rename from virtualbox_controller.py
rename to vboxwrapper/virtualbox_controller.py
diff --git a/virtualbox_error.py b/vboxwrapper/virtualbox_error.py
similarity index 100%
rename from virtualbox_error.py
rename to vboxwrapper/virtualbox_error.py