diff --git a/.github/workflows/continuous-integration-workflow.yml b/.github/workflows/continuous-integration-workflow.yml
index 5d116f9..b1d32d0 100644
--- a/.github/workflows/continuous-integration-workflow.yml
+++ b/.github/workflows/continuous-integration-workflow.yml
@@ -19,23 +19,24 @@ jobs:
     
     - name: Copy files
       run: | 
-        cp -f hbc/* executables/VisualBoyAdvanceGX/apps/vbagx/
-        cp -f hbc/* executables/VisualBoyAdvanceGX-GameCube/
-        cp -f README.md executables/VisualBoyAdvanceGX/apps/vbagx/
-        cp -f README.md executables/VisualBoyAdvanceGX-GameCube/
+        mkdir -p dist/VisualBoyAdvanceGX/apps/vbagx
+        mkdir -p dist/VisualBoyAdvanceGX/vbagx/roms
+        mkdir dist/VisualBoyAdvanceGX/vbagx/saves
+        mkdir dist/VisualBoyAdvanceGX-GameCube/
+        cp hbc/* dist/VisualBoyAdvanceGX/apps/vbagx/
+        cp executables/vbagx-wii.dol dist/VisualBoyAdvanceGX/apps/vbagx/boot.dol
+        cp executables/vbagx-gc.dol dist/VisualBoyAdvanceGX-GameCube/
 
     - name: Upload Wii Build Artifacts
       uses: actions/upload-artifact@v2
       with: 
         name: VisualBoyAdvanceGX-Nightly
         path: |
-         executables/VisualBoyAdvanceGX/
-         !executables/VisualBoyAdvanceGX/apps/vbagx/*.elf
+         dist/VisualBoyAdvanceGX/
     
     - name: Upload GameCube Build Artifacts
       uses: actions/upload-artifact@v2
       with: 
         name: VisualBoyAdvanceGX-Nightly-GameCube
         path: |
-         executables/VisualBoyAdvanceGX-GameCube/
-         !executables/VisualBoyAdvanceGX-GameCube/*.elf
+         dist/VisualBoyAdvanceGX-GameCube/
diff --git a/Makefile.gc b/Makefile.gc
index 90d9b15..8f15e0c 100644
--- a/Makefile.gc
+++ b/Makefile.gc
@@ -11,13 +11,12 @@ include $(DEVKITPPC)/gamecube_rules
 
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
-# TARGETDIR is the directory where the output files will be placed
 # BUILD is the directory where object files & intermediate files will be placed
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	boot
-TARGETDIR   :=  executables/VisualBoyAdvanceGX-GameCube
+TARGET		:=	vbagx-gc
+TARGETDIR   :=  executables
 BUILD		:=	build_gc
 SOURCES		:=	source source/gui source/utils source/utils/sz \
 				source/vba source/vba/apu source/vba/common \
@@ -120,7 +119,7 @@ $(BUILD):
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(TARGETDIR)
+	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
 
 #---------------------------------------------------------------------------------
 run:
diff --git a/Makefile.wii b/Makefile.wii
index 6fdf687..a1b0910 100644
--- a/Makefile.wii
+++ b/Makefile.wii
@@ -11,17 +11,12 @@ include $(DEVKITPPC)/wii_rules
 
 #---------------------------------------------------------------------------------
 # TARGET is the name of the output
-# TARGETDIR is the directory where the output files will be placed
-# SUBDIR are the directories where the cheats, roms and saves need to be placed
-# ROOTDIR is the root directory of the build
 # BUILD is the directory where object files & intermediate files will be placed
 # SOURCES is a list of directories containing source code
 # INCLUDES is a list of directories containing extra header files
 #---------------------------------------------------------------------------------
-TARGET		:=	boot
-TARGETDIR   :=  executables/VisualBoyAdvanceGX/apps/vbagx
-ROOTDIR		:=	executables/VisualBoyAdvanceGX
-SUBDIR		:=	executables/VisualBoyAdvanceGX/vbagx/{cheats,roms,saves}
+TARGET		:=	vbagx-wii
+TARGETDIR   :=  executables
 BUILD		:=	build_wii
 SOURCES		:=	source source/gui source/utils source/utils/sz \
 				source/vba source/vba/apu source/vba/common \
@@ -119,13 +114,13 @@ export OUTPUT	:=	$(CURDIR)/$(TARGETDIR)/$(TARGET)
 #---------------------------------------------------------------------------------
 $(BUILD):
 	@[ -d $@ ] || mkdir -p $@
-	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR) $(SUBDIR)
+	@[ -d $(TARGETDIR) ] || mkdir -p $(TARGETDIR)
 	@make --no-print-directory -C $(BUILD) -f $(CURDIR)/Makefile.wii
 
 #---------------------------------------------------------------------------------
 clean:
 	@echo clean ...
-	@rm -fr $(BUILD) $(ROOTDIR)
+	@rm -fr $(BUILD) $(OUTPUT).elf $(OUTPUT).dol
 
 #---------------------------------------------------------------------------------
 run: