diff --git a/SysBuild/guibased/e-uae b/SysBuild/tools/e-uae
similarity index 99%
rename from SysBuild/guibased/e-uae
rename to SysBuild/tools/e-uae
index 02a627e..26f6b39 100644
--- a/SysBuild/guibased/e-uae
+++ b/SysBuild/tools/e-uae
@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=GuiBased/Apps
+SRCPATH=Tools/Emu
 
 premk() {
 	sed -i "s/X11R6/X11R7/g" configure
diff --git a/SysBuild/guibased/qemu-kvm b/SysBuild/tools/qemu-kvm
similarity index 99%
rename from SysBuild/guibased/qemu-kvm
rename to SysBuild/tools/qemu-kvm
index b98f692..00fad9a 100644
--- a/SysBuild/guibased/qemu-kvm
+++ b/SysBuild/tools/qemu-kvm
@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=GuiBased/Apps
+SRCPATH=Tools/Emu
 
 premk() {
 	echo "Nothing to do for premk()"
diff --git a/SysBuild/tools/wine b/SysBuild/tools/wine
index e33c5b2..8ad6f6e 100644
--- a/SysBuild/tools/wine
+++ b/SysBuild/tools/wine
@@ -69,7 +69,7 @@
 #
 #
 
-SRCPATH=Tools/System
+SRCPATH=Tools/Emu
 
 premk() {
 	echo "Nothing to do for premk()"