diff --git a/__init__.py b/mbtrack2/__init__.py
similarity index 100%
rename from __init__.py
rename to mbtrack2/__init__.py
diff --git a/impedance/__init__.py b/mbtrack2/impedance/__init__.py
similarity index 100%
rename from impedance/__init__.py
rename to mbtrack2/impedance/__init__.py
diff --git a/impedance/csr.py b/mbtrack2/impedance/csr.py
similarity index 100%
rename from impedance/csr.py
rename to mbtrack2/impedance/csr.py
diff --git a/impedance/impedance_model.py b/mbtrack2/impedance/impedance_model.py
similarity index 100%
rename from impedance/impedance_model.py
rename to mbtrack2/impedance/impedance_model.py
diff --git a/impedance/resistive_wall.py b/mbtrack2/impedance/resistive_wall.py
similarity index 100%
rename from impedance/resistive_wall.py
rename to mbtrack2/impedance/resistive_wall.py
diff --git a/impedance/resonator.py b/mbtrack2/impedance/resonator.py
similarity index 100%
rename from impedance/resonator.py
rename to mbtrack2/impedance/resonator.py
diff --git a/impedance/tapers.py b/mbtrack2/impedance/tapers.py
similarity index 100%
rename from impedance/tapers.py
rename to mbtrack2/impedance/tapers.py
diff --git a/impedance/wakefield.py b/mbtrack2/impedance/wakefield.py
similarity index 100%
rename from impedance/wakefield.py
rename to mbtrack2/impedance/wakefield.py
diff --git a/instability/__init__.py b/mbtrack2/instability/__init__.py
similarity index 100%
rename from instability/__init__.py
rename to mbtrack2/instability/__init__.py
diff --git a/instability/instabilities.py b/mbtrack2/instability/instabilities.py
similarity index 100%
rename from instability/instabilities.py
rename to mbtrack2/instability/instabilities.py
diff --git a/instability/ions.py b/mbtrack2/instability/ions.py
similarity index 100%
rename from instability/ions.py
rename to mbtrack2/instability/ions.py
diff --git a/tracking/__init__.py b/mbtrack2/tracking/__init__.py
similarity index 100%
rename from tracking/__init__.py
rename to mbtrack2/tracking/__init__.py
diff --git a/tracking/aperture.py b/mbtrack2/tracking/aperture.py
similarity index 100%
rename from tracking/aperture.py
rename to mbtrack2/tracking/aperture.py
diff --git a/tracking/element.py b/mbtrack2/tracking/element.py
similarity index 100%
rename from tracking/element.py
rename to mbtrack2/tracking/element.py
diff --git a/tracking/monitors/__init__.py b/mbtrack2/tracking/monitors/__init__.py
similarity index 100%
rename from tracking/monitors/__init__.py
rename to mbtrack2/tracking/monitors/__init__.py
diff --git a/tracking/monitors/monitors.py b/mbtrack2/tracking/monitors/monitors.py
similarity index 100%
rename from tracking/monitors/monitors.py
rename to mbtrack2/tracking/monitors/monitors.py
diff --git a/tracking/monitors/plotting.py b/mbtrack2/tracking/monitors/plotting.py
similarity index 100%
rename from tracking/monitors/plotting.py
rename to mbtrack2/tracking/monitors/plotting.py
diff --git a/tracking/monitors/tools.py b/mbtrack2/tracking/monitors/tools.py
similarity index 100%
rename from tracking/monitors/tools.py
rename to mbtrack2/tracking/monitors/tools.py
diff --git a/tracking/parallel.py b/mbtrack2/tracking/parallel.py
similarity index 100%
rename from tracking/parallel.py
rename to mbtrack2/tracking/parallel.py
diff --git a/tracking/particles.py b/mbtrack2/tracking/particles.py
similarity index 100%
rename from tracking/particles.py
rename to mbtrack2/tracking/particles.py
diff --git a/tracking/rf.py b/mbtrack2/tracking/rf.py
similarity index 100%
rename from tracking/rf.py
rename to mbtrack2/tracking/rf.py
diff --git a/tracking/synchrotron.py b/mbtrack2/tracking/synchrotron.py
similarity index 100%
rename from tracking/synchrotron.py
rename to mbtrack2/tracking/synchrotron.py
diff --git a/tracking/wakepotential.py b/mbtrack2/tracking/wakepotential.py
similarity index 100%
rename from tracking/wakepotential.py
rename to mbtrack2/tracking/wakepotential.py
diff --git a/utilities/__init__.py b/mbtrack2/utilities/__init__.py
similarity index 100%
rename from utilities/__init__.py
rename to mbtrack2/utilities/__init__.py
diff --git a/utilities/beamloading.py b/mbtrack2/utilities/beamloading.py
similarity index 100%
rename from utilities/beamloading.py
rename to mbtrack2/utilities/beamloading.py
diff --git a/utilities/data/Yokoya_elliptic_from_Elias_USPAS.csv b/mbtrack2/utilities/data/Yokoya_elliptic_from_Elias_USPAS.csv
similarity index 100%
rename from utilities/data/Yokoya_elliptic_from_Elias_USPAS.csv
rename to mbtrack2/utilities/data/Yokoya_elliptic_from_Elias_USPAS.csv
diff --git a/utilities/misc.py b/mbtrack2/utilities/misc.py
similarity index 100%
rename from utilities/misc.py
rename to mbtrack2/utilities/misc.py
diff --git a/utilities/optics.py b/mbtrack2/utilities/optics.py
similarity index 100%
rename from utilities/optics.py
rename to mbtrack2/utilities/optics.py
diff --git a/utilities/read_impedance.py b/mbtrack2/utilities/read_impedance.py
similarity index 100%
rename from utilities/read_impedance.py
rename to mbtrack2/utilities/read_impedance.py
diff --git a/utilities/spectrum.py b/mbtrack2/utilities/spectrum.py
similarity index 100%
rename from utilities/spectrum.py
rename to mbtrack2/utilities/spectrum.py