diff --git a/analyzer/libretime_analyzer/analyzer_pipeline.py b/analyzer/libretime_analyzer/pipeline.py
similarity index 100%
rename from analyzer/libretime_analyzer/analyzer_pipeline.py
rename to analyzer/libretime_analyzer/pipeline.py
diff --git a/analyzer/libretime_analyzer/steps/__init__.py b/analyzer/libretime_analyzer/steps/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/analyzer/libretime_analyzer/cuepoint_analyzer.py b/analyzer/libretime_analyzer/steps/analyze_cuepoint.py
similarity index 100%
rename from analyzer/libretime_analyzer/cuepoint_analyzer.py
rename to analyzer/libretime_analyzer/steps/analyze_cuepoint.py
diff --git a/analyzer/libretime_analyzer/metadata_analyzer.py b/analyzer/libretime_analyzer/steps/analyze_metadata.py
similarity index 100%
rename from analyzer/libretime_analyzer/metadata_analyzer.py
rename to analyzer/libretime_analyzer/steps/analyze_metadata.py
diff --git a/analyzer/libretime_analyzer/playability_analyzer.py b/analyzer/libretime_analyzer/steps/analyze_playability.py
similarity index 100%
rename from analyzer/libretime_analyzer/playability_analyzer.py
rename to analyzer/libretime_analyzer/steps/analyze_playability.py
diff --git a/analyzer/libretime_analyzer/replaygain_analyzer.py b/analyzer/libretime_analyzer/steps/analyze_replaygain.py
similarity index 100%
rename from analyzer/libretime_analyzer/replaygain_analyzer.py
rename to analyzer/libretime_analyzer/steps/analyze_replaygain.py
diff --git a/analyzer/libretime_analyzer/filemover_analyzer.py b/analyzer/libretime_analyzer/steps/organise_file.py
similarity index 100%
rename from analyzer/libretime_analyzer/filemover_analyzer.py
rename to analyzer/libretime_analyzer/steps/organise_file.py
diff --git a/analyzer/libretime_analyzer/analyzer.py b/analyzer/libretime_analyzer/steps/step.py
similarity index 100%
rename from analyzer/libretime_analyzer/analyzer.py
rename to analyzer/libretime_analyzer/steps/step.py
diff --git a/analyzer/tests/analyzer_test.py b/analyzer/tests/analyzer_test.py
deleted file mode 100644
index fc1e53a2e..000000000
--- a/analyzer/tests/analyzer_test.py
+++ /dev/null
@@ -1,9 +0,0 @@
-import pytest
-
-from libretime_analyzer.analyzer import Analyzer
-
-
-def test_analyze():
-    with pytest.raises(NotImplementedError):
-        abstract_analyzer = Analyzer()
-        abstract_analyzer.analyze(u"foo", dict())
diff --git a/analyzer/tests/analyzer_pipeline_test.py b/analyzer/tests/pipeline_test.py
similarity index 100%
rename from analyzer/tests/analyzer_pipeline_test.py
rename to analyzer/tests/pipeline_test.py
diff --git a/analyzer/tests/steps/__init__.py b/analyzer/tests/steps/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/analyzer/tests/cuepoint_analyzer_test.py b/analyzer/tests/steps/analyze_cuepoint_test.py
similarity index 100%
rename from analyzer/tests/cuepoint_analyzer_test.py
rename to analyzer/tests/steps/analyze_cuepoint_test.py
diff --git a/analyzer/tests/metadata_analyzer_test.py b/analyzer/tests/steps/analyze_metadata_test.py
similarity index 100%
rename from analyzer/tests/metadata_analyzer_test.py
rename to analyzer/tests/steps/analyze_metadata_test.py
diff --git a/analyzer/tests/playability_analyzer_test.py b/analyzer/tests/steps/analyze_playability_test.py
similarity index 100%
rename from analyzer/tests/playability_analyzer_test.py
rename to analyzer/tests/steps/analyze_playability_test.py
diff --git a/analyzer/tests/replaygain_analyzer_test.py b/analyzer/tests/steps/analyze_replaygain_test.py
similarity index 100%
rename from analyzer/tests/replaygain_analyzer_test.py
rename to analyzer/tests/steps/analyze_replaygain_test.py
diff --git a/analyzer/tests/filemover_analyzer_test.py b/analyzer/tests/steps/organise_file_test.py
similarity index 100%
rename from analyzer/tests/filemover_analyzer_test.py
rename to analyzer/tests/steps/organise_file_test.py