diff --git a/build b/build
index 2bade0c..03eacff 100755
--- a/build
+++ b/build
@@ -13,6 +13,7 @@ cd "$(dirname "$(realpath "$0")")"
 # The different images we can build
 COMPONENTS=(
 	backfiller
+	buscribe-api
 	chat_archiver
 	cutter
 	downloader
diff --git a/buscribe/buscribe-api/Dockerfile b/buscribe-api/Dockerfile
similarity index 94%
rename from buscribe/buscribe-api/Dockerfile
rename to buscribe-api/Dockerfile
index 24f4fd0..ecf629f 100644
--- a/buscribe/buscribe-api/Dockerfile
+++ b/buscribe-api/Dockerfile
@@ -12,7 +12,7 @@ RUN pip install /tmp/common && rm -r /tmp/common
 
 # Install actual application
 RUN apk add postgresql-dev postgresql-libs
-COPY buscribe/buscribe-api /tmp/buscribe-api
+COPY buscribe-api /tmp/buscribe-api
 RUN pip install /tmp/buscribe-api && cp -r /tmp/buscribe-api/templates /templates \
     && rm -r /tmp/buscribe-api
 
diff --git a/buscribe/buscribe-api/buscribeapi/__init__.py b/buscribe-api/buscribeapi/__init__.py
similarity index 100%
rename from buscribe/buscribe-api/buscribeapi/__init__.py
rename to buscribe-api/buscribeapi/__init__.py
diff --git a/buscribe/buscribe-api/buscribeapi/__main__.py b/buscribe-api/buscribeapi/__main__.py
similarity index 100%
rename from buscribe/buscribe-api/buscribeapi/__main__.py
rename to buscribe-api/buscribeapi/__main__.py
diff --git a/buscribe/buscribe-api/buscribeapi/buscribeapi.py b/buscribe-api/buscribeapi/buscribeapi.py
similarity index 100%
rename from buscribe/buscribe-api/buscribeapi/buscribeapi.py
rename to buscribe-api/buscribeapi/buscribeapi.py
diff --git a/buscribe/buscribe-api/buscribeapi/main.py b/buscribe-api/buscribeapi/main.py
similarity index 100%
rename from buscribe/buscribe-api/buscribeapi/main.py
rename to buscribe-api/buscribeapi/main.py
diff --git a/buscribe/buscribe-api/setup.py b/buscribe-api/setup.py
similarity index 100%
rename from buscribe/buscribe-api/setup.py
rename to buscribe-api/setup.py
diff --git a/buscribe/buscribe-api/templates/busub.jinja b/buscribe-api/templates/busub.jinja
similarity index 100%
rename from buscribe/buscribe-api/templates/busub.jinja
rename to buscribe-api/templates/busub.jinja
diff --git a/buscribe/buscribe-api/templates/busubs.jinja b/buscribe-api/templates/busubs.jinja
similarity index 100%
rename from buscribe/buscribe-api/templates/busubs.jinja
rename to buscribe-api/templates/busubs.jinja