diff --git a/python_apps/airtime_analyzer/Makefile b/analyzer/Makefile
similarity index 100%
rename from python_apps/airtime_analyzer/Makefile
rename to analyzer/Makefile
diff --git a/python_apps/airtime_analyzer/README.md b/analyzer/README.md
similarity index 100%
rename from python_apps/airtime_analyzer/README.md
rename to analyzer/README.md
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/__init__.py b/analyzer/airtime_analyzer/__init__.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/__init__.py
rename to analyzer/airtime_analyzer/__init__.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/airtime_analyzer.py b/analyzer/airtime_analyzer/airtime_analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/airtime_analyzer.py
rename to analyzer/airtime_analyzer/airtime_analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/analyzer.py b/analyzer/airtime_analyzer/analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/analyzer.py
rename to analyzer/airtime_analyzer/analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py b/analyzer/airtime_analyzer/analyzer_pipeline.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/analyzer_pipeline.py
rename to analyzer/airtime_analyzer/analyzer_pipeline.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/cli.py b/analyzer/airtime_analyzer/cli.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/cli.py
rename to analyzer/airtime_analyzer/cli.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/config_file.py b/analyzer/airtime_analyzer/config_file.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/config_file.py
rename to analyzer/airtime_analyzer/config_file.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py b/analyzer/airtime_analyzer/cuepoint_analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/cuepoint_analyzer.py
rename to analyzer/airtime_analyzer/cuepoint_analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py b/analyzer/airtime_analyzer/filemover_analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/filemover_analyzer.py
rename to analyzer/airtime_analyzer/filemover_analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/message_listener.py b/analyzer/airtime_analyzer/message_listener.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/message_listener.py
rename to analyzer/airtime_analyzer/message_listener.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py b/analyzer/airtime_analyzer/metadata_analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/metadata_analyzer.py
rename to analyzer/airtime_analyzer/metadata_analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/playability_analyzer.py b/analyzer/airtime_analyzer/playability_analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/playability_analyzer.py
rename to analyzer/airtime_analyzer/playability_analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/replaygain_analyzer.py b/analyzer/airtime_analyzer/replaygain_analyzer.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/replaygain_analyzer.py
rename to analyzer/airtime_analyzer/replaygain_analyzer.py
diff --git a/python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py b/analyzer/airtime_analyzer/status_reporter.py
similarity index 100%
rename from python_apps/airtime_analyzer/airtime_analyzer/status_reporter.py
rename to analyzer/airtime_analyzer/status_reporter.py
diff --git a/python_apps/airtime_analyzer/install/systemd/libretime-analyzer.service b/analyzer/install/systemd/libretime-analyzer.service
similarity index 100%
rename from python_apps/airtime_analyzer/install/systemd/libretime-analyzer.service
rename to analyzer/install/systemd/libretime-analyzer.service
diff --git a/python_apps/airtime_analyzer/packages.ini b/analyzer/packages.ini
similarity index 100%
rename from python_apps/airtime_analyzer/packages.ini
rename to analyzer/packages.ini
diff --git a/python_apps/airtime_analyzer/setup.py b/analyzer/setup.py
similarity index 100%
rename from python_apps/airtime_analyzer/setup.py
rename to analyzer/setup.py
diff --git a/python_apps/airtime_analyzer/tests/__init__.py b/analyzer/tests/__init__.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/__init__.py
rename to analyzer/tests/__init__.py
diff --git a/python_apps/airtime_analyzer/tests/analyzer_pipeline_test.py b/analyzer/tests/analyzer_pipeline_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/analyzer_pipeline_test.py
rename to analyzer/tests/analyzer_pipeline_test.py
diff --git a/python_apps/airtime_analyzer/tests/analyzer_test.py b/analyzer/tests/analyzer_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/analyzer_test.py
rename to analyzer/tests/analyzer_test.py
diff --git a/python_apps/airtime_analyzer/tests/conftest.py b/analyzer/tests/conftest.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/conftest.py
rename to analyzer/tests/conftest.py
diff --git a/python_apps/airtime_analyzer/tests/cuepoint_analyzer_test.py b/analyzer/tests/cuepoint_analyzer_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/cuepoint_analyzer_test.py
rename to analyzer/tests/cuepoint_analyzer_test.py
diff --git a/python_apps/airtime_analyzer/tests/filemover_analyzer_test.py b/analyzer/tests/filemover_analyzer_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/filemover_analyzer_test.py
rename to analyzer/tests/filemover_analyzer_test.py
diff --git a/python_apps/airtime_analyzer/tests/fixtures/.gitignore b/analyzer/tests/fixtures/.gitignore
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/.gitignore
rename to analyzer/tests/fixtures/.gitignore
diff --git a/python_apps/airtime_analyzer/tests/fixtures/__init__.py b/analyzer/tests/fixtures/__init__.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/__init__.py
rename to analyzer/tests/fixtures/__init__.py
diff --git a/python_apps/airtime_analyzer/tests/fixtures/generate.sh b/analyzer/tests/fixtures/generate.sh
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/generate.sh
rename to analyzer/tests/fixtures/generate.sh
diff --git a/python_apps/airtime_analyzer/tests/fixtures/invalid.txt b/analyzer/tests/fixtures/invalid.txt
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/invalid.txt
rename to analyzer/tests/fixtures/invalid.txt
diff --git a/python_apps/airtime_analyzer/tests/fixtures/invalid.wma b/analyzer/tests/fixtures/invalid.wma
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/invalid.wma
rename to analyzer/tests/fixtures/invalid.wma
diff --git a/python_apps/airtime_analyzer/tests/fixtures/metadata-utf8.txt b/analyzer/tests/fixtures/metadata-utf8.txt
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/metadata-utf8.txt
rename to analyzer/tests/fixtures/metadata-utf8.txt
diff --git a/python_apps/airtime_analyzer/tests/fixtures/metadata.txt b/analyzer/tests/fixtures/metadata.txt
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/metadata.txt
rename to analyzer/tests/fixtures/metadata.txt
diff --git a/python_apps/airtime_analyzer/tests/fixtures/s1.flac b/analyzer/tests/fixtures/s1.flac
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/s1.flac
rename to analyzer/tests/fixtures/s1.flac
diff --git a/python_apps/airtime_analyzer/tests/fixtures/s2.flac b/analyzer/tests/fixtures/s2.flac
similarity index 100%
rename from python_apps/airtime_analyzer/tests/fixtures/s2.flac
rename to analyzer/tests/fixtures/s2.flac
diff --git a/python_apps/airtime_analyzer/tests/metadata_analyzer_test.py b/analyzer/tests/metadata_analyzer_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/metadata_analyzer_test.py
rename to analyzer/tests/metadata_analyzer_test.py
diff --git a/python_apps/airtime_analyzer/tests/playability_analyzer_test.py b/analyzer/tests/playability_analyzer_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/playability_analyzer_test.py
rename to analyzer/tests/playability_analyzer_test.py
diff --git a/python_apps/airtime_analyzer/tests/replaygain_analyzer_test.py b/analyzer/tests/replaygain_analyzer_test.py
similarity index 100%
rename from python_apps/airtime_analyzer/tests/replaygain_analyzer_test.py
rename to analyzer/tests/replaygain_analyzer_test.py
diff --git a/python_apps/airtime_analyzer/tools/ftp-upload-hook.sh b/analyzer/tools/ftp-upload-hook.sh
similarity index 100%
rename from python_apps/airtime_analyzer/tools/ftp-upload-hook.sh
rename to analyzer/tools/ftp-upload-hook.sh
diff --git a/python_apps/airtime_analyzer/tools/message_sender.php b/analyzer/tools/message_sender.php
similarity index 100%
rename from python_apps/airtime_analyzer/tools/message_sender.php
rename to analyzer/tools/message_sender.php
diff --git a/python_apps/airtime_analyzer/tools/test-hook-script.sh b/analyzer/tools/test-hook-script.sh
similarity index 100%
rename from python_apps/airtime_analyzer/tools/test-hook-script.sh
rename to analyzer/tools/test-hook-script.sh