diff --git a/lw-linux-base/Makefile b/linux-base/Makefile
similarity index 100%
rename from lw-linux-base/Makefile
rename to linux-base/Makefile
diff --git a/lw-linux-base/README.md b/linux-base/README.md
similarity index 100%
rename from lw-linux-base/README.md
rename to linux-base/README.md
diff --git a/lw-linux-base/appimage/artifacts.mk b/linux-base/appimage/artifacts.mk
similarity index 100%
rename from lw-linux-base/appimage/artifacts.mk
rename to linux-base/appimage/artifacts.mk
diff --git a/lw-linux-base/assets/Dockerfile b/linux-base/assets/Dockerfile
similarity index 78%
rename from lw-linux-base/assets/Dockerfile
rename to linux-base/assets/Dockerfile
index 64dc118..b85d8f9 100644
--- a/lw-linux-base/assets/Dockerfile
+++ b/linux-base/assets/Dockerfile
@@ -9,7 +9,7 @@ RUN apt-get -y update && apt-get -y upgrade && apt-get -y install make wget git
 RUN git clone https://gitlab.com/librewolf-community/browser/bsys5
 WORKDIR bsys5
 RUN git checkout flatpak
-WORKDIR flatpak
+WORKDIR linux-base
 
 RUN make setup-debian && make fetch && make arch=$arch bootstrap && make veryclean
-#RUN make setup-fedora && make fetch && make bootstrap && make veryclean
+#RUN make setup-fedora && make fetch && make arch=$arch bootstrap && make veryclean
diff --git a/lw-linux-base/assets/from-linux-repo/deb_patches/armhf-reduce-linker-memory-use.patch b/linux-base/assets/deb_patches/armhf-reduce-linker-memory-use.patch
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/deb_patches/armhf-reduce-linker-memory-use.patch
rename to linux-base/assets/deb_patches/armhf-reduce-linker-memory-use.patch
diff --git a/lw-linux-base/assets/from-linux-repo/deb_patches/fix-ftbfs-newer-cbindgen.patch b/linux-base/assets/deb_patches/fix-ftbfs-newer-cbindgen.patch
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/deb_patches/fix-ftbfs-newer-cbindgen.patch
rename to linux-base/assets/deb_patches/fix-ftbfs-newer-cbindgen.patch
diff --git a/lw-linux-base/assets/from-linux-repo/deb_patches/fix-wayland-build.patch b/linux-base/assets/deb_patches/fix-wayland-build.patch
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/deb_patches/fix-wayland-build.patch
rename to linux-base/assets/deb_patches/fix-wayland-build.patch
diff --git a/lw-linux-base/assets/from-linux-repo/deb_patches/reduce-rust-debuginfo.patch b/linux-base/assets/deb_patches/reduce-rust-debuginfo.patch
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/deb_patches/reduce-rust-debuginfo.patch
rename to linux-base/assets/deb_patches/reduce-rust-debuginfo.patch
diff --git a/lw-linux-base/assets/from-linux-repo/deb_patches/use-system-icupkg.patch b/linux-base/assets/deb_patches/use-system-icupkg.patch
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/deb_patches/use-system-icupkg.patch
rename to linux-base/assets/deb_patches/use-system-icupkg.patch
diff --git a/lw-linux-base/assets/from-linux-repo/KEY b/linux-base/assets/from-linux-repo/KEY
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/KEY
rename to linux-base/assets/from-linux-repo/KEY
diff --git a/lw-linux-base/assets/from-linux-repo/content/io.gitlab.librewolf-community.appdata.xml.in b/linux-base/assets/from-linux-repo/content/io.gitlab.librewolf-community.appdata.xml.in
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/content/io.gitlab.librewolf-community.appdata.xml.in
rename to linux-base/assets/from-linux-repo/content/io.gitlab.librewolf-community.appdata.xml.in
diff --git a/lw-linux-base/assets/from-linux-repo/content/launch_librewolf.sh b/linux-base/assets/from-linux-repo/content/launch_librewolf.sh
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/content/launch_librewolf.sh
rename to linux-base/assets/from-linux-repo/content/launch_librewolf.sh
diff --git a/lw-linux-base/assets/from-linux-repo/content/toggle-settings.sh b/linux-base/assets/from-linux-repo/content/toggle-settings.sh
similarity index 100%
rename from lw-linux-base/assets/from-linux-repo/content/toggle-settings.sh
rename to linux-base/assets/from-linux-repo/content/toggle-settings.sh
diff --git a/lw-linux-base/assets/mozconfig.aarch64 b/linux-base/assets/mozconfig.aarch64
similarity index 100%
rename from lw-linux-base/assets/mozconfig.aarch64
rename to linux-base/assets/mozconfig.aarch64
diff --git a/lw-linux-base/assets/mozconfig.x86_64 b/linux-base/assets/mozconfig.x86_64
similarity index 100%
rename from lw-linux-base/assets/mozconfig.x86_64
rename to linux-base/assets/mozconfig.x86_64
diff --git a/lw-linux-base/assets/post_package_distini_etc.sh b/linux-base/assets/post_package_distini_etc.sh
similarity index 100%
rename from lw-linux-base/assets/post_package_distini_etc.sh
rename to linux-base/assets/post_package_distini_etc.sh
diff --git a/lw-linux-base/assets/pre_build_patches_mozconfig.sh b/linux-base/assets/pre_build_patches_mozconfig.sh
similarity index 76%
rename from lw-linux-base/assets/pre_build_patches_mozconfig.sh
rename to linux-base/assets/pre_build_patches_mozconfig.sh
index 8dec0fb..ebca54a 100755
--- a/lw-linux-base/assets/pre_build_patches_mozconfig.sh
+++ b/linux-base/assets/pre_build_patches_mozconfig.sh
@@ -31,12 +31,12 @@ fi
 cd librewolf-$full_version
 
 # hopefully the magic sauce that makes things build on 18.04 and later on work "everywhere"
-patch -Np1 -i ../assets/linux-base//deb_patches/armhf-reduce-linker-memory-use.patch
-patch -Np1 -i ../assets/linux-base//deb_patches/reduce-rust-debuginfo.patch
-patch -Np1 -i ../assets/linux-base//deb_patches/use-system-icupkg.patch
+patch -Np1 -i ../assets/deb_patches/armhf-reduce-linker-memory-use.patch
+patch -Np1 -i ../assets/deb_patches/reduce-rust-debuginfo.patch
+patch -Np1 -i ../assets/deb_patches/use-system-icupkg.patch
 
 # might make the build just a tiny bit cleaner, not really required though
-patch -Np1 -i ../assets/linux-base//deb_patches/fix-wayland-build.patch
+patch -Np1 -i ../assets/deb_patches/fix-wayland-build.patch
 
 cd ..
 
diff --git a/lw-linux-base/flatpak/artifacts.mk b/linux-base/flatpak/artifacts.mk
similarity index 100%
rename from lw-linux-base/flatpak/artifacts.mk
rename to linux-base/flatpak/artifacts.mk
diff --git a/lw-linux-base/flatpak/io.gitlab.librewolf-community.json b/linux-base/flatpak/io.gitlab.librewolf-community.json
similarity index 100%
rename from lw-linux-base/flatpak/io.gitlab.librewolf-community.json
rename to linux-base/flatpak/io.gitlab.librewolf-community.json
diff --git a/lw-linux-base/flatpak/setup-debian.sh b/linux-base/flatpak/setup-debian.sh
similarity index 100%
rename from lw-linux-base/flatpak/setup-debian.sh
rename to linux-base/flatpak/setup-debian.sh
diff --git a/lw-linux-base/release b/linux-base/release
similarity index 100%
rename from lw-linux-base/release
rename to linux-base/release