diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6c2493461..fe6704111 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -30,7 +30,7 @@ updates:
       - dependencies
 
   - package-ecosystem: "pip"
-    directory: "/python_apps/airtime_analyzer"
+    directory: "/analyzer"
     schedule:
       interval: "daily"
     labels:
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 27637d72b..b068a238a 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -126,7 +126,7 @@ jobs:
       - name: Lint
         run: |
           make -C api lint
-          make -C python_apps/airtime_analyzer lint
+          make -C analyzer lint
           make -C python_apps/airtime-celery lint
           make -C python_apps/api_clients lint
           make -C python_apps/pypo lint
@@ -136,7 +136,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        context: [python_apps/airtime_analyzer, python_apps/api_clients]
+        context: [analyzer, python_apps/api_clients]
         release: [bionic, buster]
 
     container: ghcr.io/libretime/libretime-dev:${{ matrix.release }}
diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
index 270c5be1c..8e5aadbcd 100644
--- a/.github/workflows/tools.yml
+++ b/.github/workflows/tools.yml
@@ -46,7 +46,7 @@ jobs:
       - name: Generate packages list
         run: |
           tools/packages.py --dev --format line ${{ matrix.release }} \
-            python_apps/airtime_analyzer \
+            analyzer \
             python_apps/pypo \
             > packages.list
 
diff --git a/analyzer/Makefile b/analyzer/Makefile
index 07c620816..976fc9a1f 100644
--- a/analyzer/Makefile
+++ b/analyzer/Makefile
@@ -1,6 +1,6 @@
 all: lint test
 
-include ../../tools/python.mk
+include ../tools/python.mk
 
 PIP_INSTALL := --editable .[dev]
 PYLINT_ARG := airtime_analyzer tests
diff --git a/install b/install
index 903ff9091..ff811581b 100755
--- a/install
+++ b/install
@@ -196,7 +196,7 @@ function systemInitInstall() {
   if $has_systemd_init; then
     case "$service_name" in
       libretime-analyzer)
-        source_path="${python_source_path}/airtime_analyzer/install/systemd/${service_name}.service"
+        source_path="${SCRIPT_DIR}/analyzer/install/systemd/${service_name}.service"
         target_path="/etc/systemd/system/${service_name}.service"
         alt_path="${target_path//libretime-/airtime_}"
         ;;
@@ -258,7 +258,7 @@ function systemInitInstall() {
   elif $has_upstart_init; then
     case "$service_name" in
       libretime-analyzer)
-        source_path="${python_source_path}/airtime_analyzer/install/upstart/${service_name}.conf"
+        source_path="${SCRIPT_DIR}/analyzer/install/upstart/${service_name}.conf"
         target_path="/etc/init/${service_name}.conf"
         user=${user:-$web_user}
         ;;
@@ -296,7 +296,7 @@ function systemInitInstall() {
   elif $has_systemv_init; then
     case "$service_name" in
       libretime-analyzer)
-        source_path="${python_source_path}/airtime_analyzer/install/sysvinit/${service_name}"
+        source_path="${SCRIPT_DIR}/analyzer/install/sysvinit/${service_name}"
         target_path="/etc/init.d/${service_name}"
         user=${user:-$web_user}
         ;;
@@ -759,7 +759,7 @@ if [ "$ignore_dependencies" = "f" ]; then
       "${SCRIPT_DIR}/"
       "${SCRIPT_DIR}/legacy"
       "${SCRIPT_DIR}/api"
-      "${SCRIPT_DIR}/python_apps/airtime_analyzer"
+      "${SCRIPT_DIR}/analyzer"
       "${SCRIPT_DIR}/python_apps/pypo"
     )
 
@@ -1001,7 +1001,7 @@ pip_cmd="$python_bin -m pip"
 verbose "\n * Installing necessary python services..."
 loudCmd "$pip_cmd install --upgrade setuptools~=58.0"
 # Required here because PyGObject requires it, but it is installed after PyGObject
-# when pip parses the setup.py file in airtime_analyzer
+# when pip parses the setup.py file in analyzer
 loudCmd "$pip_cmd install pycairo==1.19.1"
 verbose "...Done"
 
@@ -1047,7 +1047,7 @@ systemInitInstall libretime-celery
 verbose "...Done"
 
 verbose "\n * Installing libretime-analyzer..."
-loudCmd "$pip_cmd install ${AIRTIMEROOT}/python_apps/airtime_analyzer"
+loudCmd "$pip_cmd install ${AIRTIMEROOT}/analyzer"
 systemInitInstall libretime-analyzer "$web_user"
 verbose "...Done"