diff --git a/mpsd-software.py b/mpsd-software-manager/mpsd-software.py
similarity index 100%
rename from mpsd-software.py
rename to mpsd-software-manager/mpsd-software.py
diff --git a/test_mpsd-software.py b/tests/test_mpsd-software.py
similarity index 100%
rename from test_mpsd-software.py
rename to tests/test_mpsd-software.py