diff --git a/lw-linux-base/Makefile b/lw-linux-base/Makefile
index f9434c1..47aaee3 100644
--- a/lw-linux-base/Makefile
+++ b/lw-linux-base/Makefile
@@ -4,7 +4,11 @@ version:=$(shell cat version)
 release:=$(shell cat release)
 source_release:=$(shell cat source_release)
 full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
+
 mozbuild=~/.mozbuild
+ifeq ($(target_type),)
+target_type:=flatpak
+endif
 
 ifeq ($(arch),)
 arch:=x86_64
@@ -37,6 +41,7 @@ help :
 	@echo "  docker-clean - Remove the docker image."
 	@echo ""
 	@echo "Use arch=x86_64 or arch=aarch64 to specify the target architecture."
+	@echo "Use target_type=flatpak or target_type=appimage to specify target type."
 
 
 
@@ -46,6 +51,7 @@ update :
 	@wget -q -O version "https://gitlab.com/librewolf-community/browser/source/-/raw/main/version"
 	@wget -q -O source_release "https://gitlab.com/librewolf-community/browser/source/-/raw/main/release"
 	@echo "Using LibreWolf version $$(cat version)-$$(cat source_release)."
+	@echo "Targeting: $(target_type), architecture: $(arch)."
 
 fetch : update
 	@wget -q -O "librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum" "https://gitlab.com/librewolf-community/browser/source/-/jobs/artifacts/main/raw/librewolf-$$(cat version)-$$(cat source_release).source.tar.gz.sha256sum?job=Build"
@@ -88,7 +94,7 @@ post-package :
 	./assets/post_package_distini_etc.sh
 
 artifacts :
-	${MAKE} -f assets/flatpak/artifacts.mk artifacts
+	${MAKE} -f assets/$(target_type)/artifacts.mk artifacts
 
 
 
diff --git a/lw-linux-base/assets/appimage/artifacts.mk b/lw-linux-base/assets/appimage/artifacts.mk
new file mode 100644
index 0000000..1645153
--- /dev/null
+++ b/lw-linux-base/assets/appimage/artifacts.mk
@@ -0,0 +1,14 @@
+.PHONY: artifacts
+
+version:=$(shell cat version)
+release:=$(shell cat release)
+source_release:=$(shell cat source_release)
+full_version:=$(version)-$(source_release)$(shell [ $(release) -gt 1 ] && echo "-$(release)")
+mozbuild=~/.mozbuild
+
+incoming_artifact=firefox-$(full_version).en-US.win64.zip
+setupname=librewolf-$(full_version).en-US.win64-setup.exe
+zipname=librewolf-$(full_version).en-US.win64-portable.zip
+
+artifacts :
+	@echo "assets/appimage/artifacts.mk: Starting artifacts build."
diff --git a/lw-linux-base/assets/KEY b/lw-linux-base/assets/linux-base/KEY
similarity index 100%
rename from lw-linux-base/assets/KEY
rename to lw-linux-base/assets/linux-base/KEY
diff --git a/lw-linux-base/assets/content/io.gitlab.librewolf-community.appdata.xml.in b/lw-linux-base/assets/linux-base/content/io.gitlab.librewolf-community.appdata.xml.in
similarity index 100%
rename from lw-linux-base/assets/content/io.gitlab.librewolf-community.appdata.xml.in
rename to lw-linux-base/assets/linux-base/content/io.gitlab.librewolf-community.appdata.xml.in
diff --git a/lw-linux-base/assets/content/launch_librewolf.sh b/lw-linux-base/assets/linux-base/content/launch_librewolf.sh
similarity index 100%
rename from lw-linux-base/assets/content/launch_librewolf.sh
rename to lw-linux-base/assets/linux-base/content/launch_librewolf.sh
diff --git a/lw-linux-base/assets/content/toggle-settings.sh b/lw-linux-base/assets/linux-base/content/toggle-settings.sh
similarity index 100%
rename from lw-linux-base/assets/content/toggle-settings.sh
rename to lw-linux-base/assets/linux-base/content/toggle-settings.sh
diff --git a/lw-linux-base/assets/deb_patches/armhf-reduce-linker-memory-use.patch b/lw-linux-base/assets/linux-base/deb_patches/armhf-reduce-linker-memory-use.patch
similarity index 100%
rename from lw-linux-base/assets/deb_patches/armhf-reduce-linker-memory-use.patch
rename to lw-linux-base/assets/linux-base/deb_patches/armhf-reduce-linker-memory-use.patch
diff --git a/lw-linux-base/assets/deb_patches/fix-ftbfs-newer-cbindgen.patch b/lw-linux-base/assets/linux-base/deb_patches/fix-ftbfs-newer-cbindgen.patch
similarity index 100%
rename from lw-linux-base/assets/deb_patches/fix-ftbfs-newer-cbindgen.patch
rename to lw-linux-base/assets/linux-base/deb_patches/fix-ftbfs-newer-cbindgen.patch
diff --git a/lw-linux-base/assets/deb_patches/fix-wayland-build.patch b/lw-linux-base/assets/linux-base/deb_patches/fix-wayland-build.patch
similarity index 100%
rename from lw-linux-base/assets/deb_patches/fix-wayland-build.patch
rename to lw-linux-base/assets/linux-base/deb_patches/fix-wayland-build.patch
diff --git a/lw-linux-base/assets/deb_patches/reduce-rust-debuginfo.patch b/lw-linux-base/assets/linux-base/deb_patches/reduce-rust-debuginfo.patch
similarity index 100%
rename from lw-linux-base/assets/deb_patches/reduce-rust-debuginfo.patch
rename to lw-linux-base/assets/linux-base/deb_patches/reduce-rust-debuginfo.patch
diff --git a/lw-linux-base/assets/deb_patches/use-system-icupkg.patch b/lw-linux-base/assets/linux-base/deb_patches/use-system-icupkg.patch
similarity index 100%
rename from lw-linux-base/assets/deb_patches/use-system-icupkg.patch
rename to lw-linux-base/assets/linux-base/deb_patches/use-system-icupkg.patch