diff --git a/.gitignore b/.gitignore
index d6a310dc..414db649 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ dist
 
 test/ACHIP_EA1_2021.1351.001
 
+build
 distributions
 
 docs/_build
diff --git a/cheetah/__init__.py b/cheetah/__init__.py
index b5b51d28..aac43f1d 100644
--- a/cheetah/__init__.py
+++ b/cheetah/__init__.py
@@ -1,4 +1,4 @@
 # flake8: noqa
-from cheetah import converters
+import cheetah.converters
 from cheetah.accelerator import *
 from cheetah.particles import *
diff --git a/cheetah/converters/__init__.py b/cheetah/converters/__init__.py
index 3b6aaac2..12bee03c 100644
--- a/cheetah/converters/__init__.py
+++ b/cheetah/converters/__init__.py
@@ -1,2 +1,2 @@
 # flake8: noqa
-from . import astralavista, dontbmad, nocelot
+from cheetah.converters import astralavista, dontbmad, nocelot
diff --git a/setup.py b/setup.py
index c1d0958f..cac3fa3f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
 from pathlib import Path
 
-from setuptools import setup
+from setuptools import find_packages, setup
 
 this_directory = Path(__file__).parent
 long_description = (this_directory / "README.md").read_text()
@@ -17,7 +17,7 @@
     ),
     long_description=long_description,
     long_description_content_type="text/markdown",
-    packages=["cheetah"],
+    packages=[package for package in find_packages() if package.startswith("cheetah")],
     python_requires=">=3.9",
     install_requires=["matplotlib", "numpy", "scipy", "torch"],
 )