diff --git a/deployment/installer/.env b/.env
similarity index 100%
rename from deployment/installer/.env
rename to .env
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 15d00b5e2..fc81ae57a 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -50,7 +50,6 @@ jobs:
           path: ./deployment/installer/.env
       - name: Push container
         run: docker-compose build && docker-compose push
-        working-directory: ./deployment/installer/
         env:
           REGISTRY_PREFIX: ${{ steps.dotenv.outputs.registry_prefix }}
           VERSION: ${{ steps.dotenv.outputs.version }}
\ No newline at end of file
diff --git a/abstracto-application/pom.xml b/abstracto-application/pom.xml
index a8de11045..e51fab1f9 100644
--- a/abstracto-application/pom.xml
+++ b/abstracto-application/pom.xml
@@ -19,7 +19,6 @@
         <module>scheduling</module>
         <module>documentation</module>
         <module>bundle</module>
-        <module>rest-api</module>
     </modules>
 
     <distributionManagement>
diff --git a/abstracto-application/rest-api/pom.xml b/abstracto-application/rest-api/pom.xml
deleted file mode 100644
index 365ec13d1..000000000
--- a/abstracto-application/rest-api/pom.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>dev.sheldan.abstracto</groupId>
-        <artifactId>abstracto-application</artifactId>
-        <version>1.5.15-SNAPSHOT</version>
-    </parent>
-
-    <groupId>dev.sheldan.sissi.api</groupId>
-    <artifactId>rest-api</artifactId>
-    <packaging>pom</packaging>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>single</goal>
-                        </goals>
-                        <configuration>
-                            <finalName>rest-api-${project.version}</finalName>
-                            <appendAssemblyId>false</appendAssemblyId>
-                            <descriptors>
-                                <descriptor>src/main/assembly/assembly.xml</descriptor>
-                            </descriptors>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
\ No newline at end of file
diff --git a/abstracto-application/rest-api/src/main/assembly/assembly.xml b/abstracto-application/rest-api/src/main/assembly/assembly.xml
deleted file mode 100644
index 75cb4f21d..000000000
--- a/abstracto-application/rest-api/src/main/assembly/assembly.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-          xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
-    <id>zip</id>
-    <includeBaseDirectory>false</includeBaseDirectory>
-    <formats>
-        <format>zip</format>
-    </formats>
-    <fileSets>
-        <fileSet>
-            <outputDirectory>resources</outputDirectory>
-            <directory>${project.basedir}/src/main/resources</directory>
-        </fileSet>
-        <fileSet>
-            <outputDirectory>.</outputDirectory>
-            <directory>${project.basedir}/src/main/python</directory>
-        </fileSet>
-    </fileSets>
-</assembly>
\ No newline at end of file
diff --git a/deployment/installer/docker-compose.yaml b/deployment/installer/docker-compose.yaml
deleted file mode 100644
index f104c025c..000000000
--- a/deployment/installer/docker-compose.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: "3.7"
-
-services:
-  config_deployment:
-    build: config-deployment
-    image: ${REGISTRY_PREFIX}abstracto-db-deployment:${VERSION:-latest}
-  template_deployment:
-    build: template-deployment
-    image: ${REGISTRY_PREFIX}abstracto-template-deployment:${VERSION:-latest}
\ No newline at end of file
diff --git a/docker-compose.yaml b/docker-compose.yaml
new file mode 100644
index 000000000..0b0414956
--- /dev/null
+++ b/docker-compose.yaml
@@ -0,0 +1,14 @@
+version: "3.7"
+
+services:
+  config_deployment:
+    build: python/deployment/installer/config-deployment
+    image: ${REGISTRY_PREFIX}abstracto-db-deployment:${VERSION:-latest}
+  template_deployment:
+    build: python/deployment/installer/template-deployment
+    image: ${REGISTRY_PREFIX}abstracto-template-deployment:${VERSION:-latest}
+  rest_api:
+    build:
+      context: python/components/rest-api
+      dockerfile: docker/Dockerfile
+    image: ${REGISTRY_PREFIX}abstracto-rest-api:${VERSION:-latest}
diff --git a/python/components/rest-api/docker/Dockerfile b/python/components/rest-api/docker/Dockerfile
new file mode 100644
index 000000000..3fad9eee2
--- /dev/null
+++ b/python/components/rest-api/docker/Dockerfile
@@ -0,0 +1,10 @@
+FROM python:3.10.13-alpine3.18
+RUN apk --no-cache add msttcorefonts-installer fontconfig && \
+    update-ms-fonts && \
+    fc-cache -f
+ADD wrapper /
+ADD python/requirements.txt requirements.txt
+RUN pip install -r requirements.txt
+ADD resources /python/resources
+ADD python /python
+CMD ["/run.sh"]
\ No newline at end of file
diff --git a/abstracto-application/rest-api/src/main/python/__init__.py b/python/components/rest-api/python/__init__.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/__init__.py
rename to python/components/rest-api/python/__init__.py
diff --git a/abstracto-application/rest-api/src/main/python/base/__init__.py b/python/components/rest-api/python/base/__init__.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/base/__init__.py
rename to python/components/rest-api/python/base/__init__.py
diff --git a/abstracto-application/rest-api/src/main/python/base/image_gen.py b/python/components/rest-api/python/base/image_gen.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/base/image_gen.py
rename to python/components/rest-api/python/base/image_gen.py
diff --git a/abstracto-application/rest-api/src/main/python/custom/__init__.py b/python/components/rest-api/python/custom/__init__.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/custom/__init__.py
rename to python/components/rest-api/python/custom/__init__.py
diff --git a/abstracto-application/rest-api/src/main/python/main.py b/python/components/rest-api/python/main.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/main.py
rename to python/components/rest-api/python/main.py
diff --git a/python/components/rest-api/python/requirements.txt b/python/components/rest-api/python/requirements.txt
new file mode 100644
index 000000000..3d3e1406a
--- /dev/null
+++ b/python/components/rest-api/python/requirements.txt
@@ -0,0 +1,17 @@
+blinker==1.7.0
+certifi==2023.7.22
+charset-normalizer==3.3.2
+click==8.1.7
+Flask==3.0.0
+idna==3.4
+importlib-metadata==6.8.0
+itsdangerous==2.1.2
+Jinja2==3.1.2
+MarkupSafe==2.1.3
+Pillow==10.1.0
+requests==2.31.0
+urllib3==2.0.7
+waitress==2.1.2
+Werkzeug==3.0.1
+zipp==3.17.0
+pytz==2023.3.post1
\ No newline at end of file
diff --git a/abstracto-application/rest-api/src/main/python/utils/__init__.py b/python/components/rest-api/python/utils/__init__.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/utils/__init__.py
rename to python/components/rest-api/python/utils/__init__.py
diff --git a/abstracto-application/rest-api/src/main/python/utils/flask_utils.py b/python/components/rest-api/python/utils/flask_utils.py
similarity index 100%
rename from abstracto-application/rest-api/src/main/python/utils/flask_utils.py
rename to python/components/rest-api/python/utils/flask_utils.py
diff --git a/abstracto-application/rest-api/src/main/resources/img/semf_template.jpg b/python/components/rest-api/resources/img/semf_template.jpg
similarity index 100%
rename from abstracto-application/rest-api/src/main/resources/img/semf_template.jpg
rename to python/components/rest-api/resources/img/semf_template.jpg
diff --git a/python/components/rest-api/wrapper/run.sh b/python/components/rest-api/wrapper/run.sh
new file mode 100755
index 000000000..95dc52d51
--- /dev/null
+++ b/python/components/rest-api/wrapper/run.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+echo "Starting python server..."
+cd python
+python3 -u main.py
\ No newline at end of file
diff --git a/deployment/installer/config-deployment/Dockerfile b/python/deployment/installer/config-deployment/Dockerfile
similarity index 100%
rename from deployment/installer/config-deployment/Dockerfile
rename to python/deployment/installer/config-deployment/Dockerfile
diff --git a/deployment/installer/config-deployment/__init__.py b/python/deployment/installer/config-deployment/__init__.py
similarity index 100%
rename from deployment/installer/config-deployment/__init__.py
rename to python/deployment/installer/config-deployment/__init__.py
diff --git a/deployment/installer/config-deployment/python/__init__.py b/python/deployment/installer/config-deployment/python/__init__.py
similarity index 100%
rename from deployment/installer/config-deployment/python/__init__.py
rename to python/deployment/installer/config-deployment/python/__init__.py
diff --git a/deployment/installer/config-deployment/python/liquibase_deploy.py b/python/deployment/installer/config-deployment/python/liquibase_deploy.py
similarity index 100%
rename from deployment/installer/config-deployment/python/liquibase_deploy.py
rename to python/deployment/installer/config-deployment/python/liquibase_deploy.py
diff --git a/deployment/installer/config-deployment/python/main.py b/python/deployment/installer/config-deployment/python/main.py
similarity index 100%
rename from deployment/installer/config-deployment/python/main.py
rename to python/deployment/installer/config-deployment/python/main.py
diff --git a/deployment/installer/config-deployment/python/templates/liquibase.properties.j2 b/python/deployment/installer/config-deployment/python/templates/liquibase.properties.j2
similarity index 100%
rename from deployment/installer/config-deployment/python/templates/liquibase.properties.j2
rename to python/deployment/installer/config-deployment/python/templates/liquibase.properties.j2
diff --git a/deployment/installer/config-deployment/wrapper/deploy.sh b/python/deployment/installer/config-deployment/wrapper/deploy.sh
similarity index 100%
rename from deployment/installer/config-deployment/wrapper/deploy.sh
rename to python/deployment/installer/config-deployment/wrapper/deploy.sh
diff --git a/deployment/installer/template-deployment/Dockerfile b/python/deployment/installer/template-deployment/Dockerfile
similarity index 100%
rename from deployment/installer/template-deployment/Dockerfile
rename to python/deployment/installer/template-deployment/Dockerfile
diff --git a/deployment/installer/template-deployment/__init__.py b/python/deployment/installer/template-deployment/__init__.py
similarity index 100%
rename from deployment/installer/template-deployment/__init__.py
rename to python/deployment/installer/template-deployment/__init__.py
diff --git a/deployment/installer/template-deployment/python/__init__.py b/python/deployment/installer/template-deployment/python/__init__.py
similarity index 100%
rename from deployment/installer/template-deployment/python/__init__.py
rename to python/deployment/installer/template-deployment/python/__init__.py
diff --git a/deployment/installer/template-deployment/python/main.py b/python/deployment/installer/template-deployment/python/main.py
similarity index 100%
rename from deployment/installer/template-deployment/python/main.py
rename to python/deployment/installer/template-deployment/python/main.py
diff --git a/deployment/installer/template-deployment/python/templates_deploy.py b/python/deployment/installer/template-deployment/python/templates_deploy.py
similarity index 100%
rename from deployment/installer/template-deployment/python/templates_deploy.py
rename to python/deployment/installer/template-deployment/python/templates_deploy.py
diff --git a/deployment/installer/template-deployment/wrapper/deploy.sh b/python/deployment/installer/template-deployment/wrapper/deploy.sh
similarity index 100%
rename from deployment/installer/template-deployment/wrapper/deploy.sh
rename to python/deployment/installer/template-deployment/wrapper/deploy.sh