diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eb8a65863083f69b79630e2b37737055fb42e345..087fb1b0c2a64e74081bf7095ba2950fbc003872 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,7 @@ build-and-release:
     tags:
         - main
     script:
-        - flatpak run org.flatpak.Builder --gpg-sign=$GPG_SIGN --gpg-homedir=$GPG_HOMEDIR --repo=./build/flatpak-repo ./build/flatpak/ no.ntnu.jonasjso.DoubleTrouble.Menu.yaml;
-        - mv build/flatpak-repo flatpak-repos/double-trouble
+        - flatpak run org.flatpak.Builder --gpg-sign=$GPG_SIGN --gpg-homedir=$GPG_HOMEDIR --repo=./flatpak-repos/double-trouble ./build/flatpak-build integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;
         - cd flatpak-repos
         - git add double-trouble
         - git commit -m "New release from CI_SERVER_NAME - $CI_SERVER_NAME, CI_PIPELINE_ID - $CI_PIPELINE_ID"
diff --git a/.gitmodules b/.gitmodules
index 0d8fe426363956f5b621b8f66cb44f4ed620a96d..8e0cdb10163cc7212a5994257582c20d3ad872d9 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "external/sfml"]
-	path = external/sfml
+	path = submodules/sfml
 	url = https://github.com/SFML/SFML
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 83592a52cd0f0d80733488d58f43ce5c813b0ee9..365bef8b3985e5701563a5c9b8d8366095332a7e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -6,7 +6,7 @@ set(BINDIR ${CMAKE_BINARY_DIR})
 
 # SFML
 set(BUILD_SHARED_LIBS FALSE)
-add_subdirectory("./external/sfml")
+add_subdirectory("./submodules/sfml")
 
 # make_target - Function to setup a base c++17-target linked to SFML libraries.
 function(make_target target)
diff --git a/Makefile b/Makefile
index 1b6c93c12c3e9b36a7b8ae67d7ef00ceff6947a6..35a5c2360a647e8a69f0ad494d087521c8cec8a9 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ all:
 
 
 dockerhub:
-	docker build -f docker/sfml.Dockerfile .;
+	docker build -f integrations/dockerhub/sfml.Dockerfile .;
 	docker tag $$(docker images | awk '{print $$3}' | awk 'NR==2') jonasjso/sfml:latest;
 	docker login --username=jonasjso;
 	docker push jonasjso/sfml;
@@ -34,7 +34,7 @@ flatpak:
 	flatpak run org.flatpak.Builder\
 		--gpg-sign=$$GPG_SIGN\
 		--gpg-homedir=$$GPG_HOMEDIR\
-		--repo=./build/flatpak-repo\
 		--force-clean\
-		./build/flatpak/\
-		no.ntnu.jonasjso.DoubleTrouble.Menu.yaml;
+		--repo=./build/flatpak-repo\
+		./build/flatpak-build\
+		integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml;
diff --git a/docker/sfml.Dockerfile b/integrations/dockerhub/sfml.Dockerfile
similarity index 85%
rename from docker/sfml.Dockerfile
rename to integrations/dockerhub/sfml.Dockerfile
index 43423a7be1af031f8d560767a56f1eb5703e4686..b7f4032a76136fa2111fd200a7905312f602b19f 100644
--- a/docker/sfml.Dockerfile
+++ b/integrations/dockerhub/sfml.Dockerfile
@@ -1,6 +1,6 @@
 FROM ubuntu:latest
 
-# Bring your own SFML
+# Bring your own SFML hosted at https://hub.docker.com/repository/docker/jonasjso/sfml
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV CXX g++
@@ -27,4 +27,3 @@ RUN flatpak remote-add flathub https://flathub.org/repo/flathub.flatpakrepo\
 	org.freedesktop.Platform/x86_64/20.08\
 	org.freedesktop.Sdk/x86_64/20.08\
 	org.flatpak.Builder/x86_64/stable;
-
diff --git a/flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml b/integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml
similarity index 64%
rename from flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml
rename to integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml
index 5e0a09bdf49679be17774d840b45da063df35dff..145567159e4b888a2a92e48b0004e8417813aecc 100644
--- a/flatpak/no.ntnu.jonasjso.DoubleTrouble.Menu.yaml
+++ b/integrations/flatpak/no.ntnu.jonasjso.doubleTrouble.Menu.yaml
@@ -1,8 +1,8 @@
-app-id: no.ntnu.jonasjso.DoubleTrouble.Menu
+app-id: no.ntnu.jonasjso.doubleTrouble.Menu
 runtime: org.freedesktop.Platform
 runtime-version: '20.08'
 sdk: org.freedesktop.Sdk
-command: Menu
+command: no.ntnu.jonasjso.doubleTrouble.Menu
 finish-args:
         - --share=ipc
         - --socket=x11
@@ -17,8 +17,8 @@ modules:
                 - mkdir build/
                 - cmake -S . -B build/
                 - make -C build/
-                - install -D ./build/03-menu /app/bin/Menu
+                - install -D ./build/03-menu /app/bin/no.ntnu.jonasjso.doubleTrouble.Menu
           sources:
-                - type: dir 
-                  path: .
+                - type: git 
+                  path: ../../
 
diff --git a/external/sfml b/submodules/sfml
similarity index 100%
rename from external/sfml
rename to submodules/sfml