diff --git a/autoPyLoT.in b/inputs/autoPyLoT.in
similarity index 100%
rename from autoPyLoT.in
rename to inputs/autoPyLoT.in
diff --git a/autoPyLoT_local.in b/inputs/autoPyLoT_local.in
similarity index 100%
rename from autoPyLoT_local.in
rename to inputs/autoPyLoT_local.in
diff --git a/autoPyLoT_regional.in b/inputs/autoPyLoT_regional.in
similarity index 100%
rename from autoPyLoT_regional.in
rename to inputs/autoPyLoT_regional.in
diff --git a/filter.in b/inputs/filter.in
similarity index 100%
rename from filter.in
rename to inputs/filter.in
diff --git a/pylot/testing/__init__.py b/pylot/testing/__init__.py
new file mode 100644
index 00000000..e69de29b
diff --git a/testHelpForm.py b/pylot/testing/testHelpForm.py
similarity index 100%
rename from testHelpForm.py
rename to pylot/testing/testHelpForm.py
diff --git a/testPickDlg.py b/pylot/testing/testPickDlg.py
similarity index 100%
rename from testPickDlg.py
rename to pylot/testing/testPickDlg.py
diff --git a/testPropDlg.py b/pylot/testing/testPropDlg.py
similarity index 100%
rename from testPropDlg.py
rename to pylot/testing/testPropDlg.py
diff --git a/testUIcomponents.py b/pylot/testing/testUIcomponents.py
similarity index 100%
rename from testUIcomponents.py
rename to pylot/testing/testUIcomponents.py
diff --git a/pylot/core/util/testUtils.py b/pylot/testing/testUtils.py
similarity index 100%
rename from pylot/core/util/testUtils.py
rename to pylot/testing/testUtils.py
diff --git a/pylot/core/util/testWidgets.py b/pylot/testing/testWidgets.py
similarity index 100%
rename from pylot/core/util/testWidgets.py
rename to pylot/testing/testWidgets.py
diff --git a/test_autopick.py b/pylot/testing/test_autopick.py
similarity index 100%
rename from test_autopick.py
rename to pylot/testing/test_autopick.py
diff --git a/pylot/core/scripts/pylot-noisewindow.py b/scripts/pylot-noisewindow.py
similarity index 100%
rename from pylot/core/scripts/pylot-noisewindow.py
rename to scripts/pylot-noisewindow.py
diff --git a/pylot/core/scripts/pylot-pick-earliest-latest.py b/scripts/pylot-pick-earliest-latest.py
similarity index 100%
rename from pylot/core/scripts/pylot-pick-earliest-latest.py
rename to scripts/pylot-pick-earliest-latest.py
diff --git a/pylot/core/scripts/pylot-pick-firstmotion.py b/scripts/pylot-pick-firstmotion.py
similarity index 100%
rename from pylot/core/scripts/pylot-pick-firstmotion.py
rename to scripts/pylot-pick-firstmotion.py
diff --git a/pylot/core/scripts/pylot-signalwindow.py b/scripts/pylot-signalwindow.py
similarity index 100%
rename from pylot/core/scripts/pylot-signalwindow.py
rename to scripts/pylot-signalwindow.py
diff --git a/pylot/core/scripts/pylot-snr.py b/scripts/pylot-snr.py
similarity index 100%
rename from pylot/core/scripts/pylot-snr.py
rename to scripts/pylot-snr.py
diff --git a/pylot/core/scripts/run_makeCF.py b/scripts/run_makeCF.py
similarity index 100%
rename from pylot/core/scripts/run_makeCF.py
rename to scripts/run_makeCF.py