diff --git a/.gitmodules b/.gitmodules
index 668aa541..8c004f8e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
 [submodule "source/frontends/qapple/QHexView"]
-	path = source/frontends/qapple/QHexView
+	path = source/frontends/qt/QHexView
 	url = ../QHexView.git
diff --git a/CMakeLists.txt b/CMakeLists.txt
index b464b8ff..bd090ca9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -36,7 +36,7 @@ include_directories(source)
 add_subdirectory(source)
 add_subdirectory(source/frontends/common2)
 add_subdirectory(source/frontends/ncurses)
-add_subdirectory(source/frontends/qapple)
+add_subdirectory(source/frontends/qt)
 add_subdirectory(source/frontends/sa2)
 add_subdirectory(source/frontends/retro)
 add_subdirectory(test/TestCPU6502)
diff --git a/source/frontends/common2/configuration.cpp b/source/frontends/common2/configuration.cpp
index 70ae76e1..53ca62aa 100644
--- a/source/frontends/common2/configuration.cpp
+++ b/source/frontends/common2/configuration.cpp
@@ -3,7 +3,7 @@
 
 #include "Log.h"
 #include "linux/windows/files.h"
-#include "frontends/qapple/applicationname.h"
+#include "frontends/qt/applicationname.h"
 
 #include <boost/property_tree/ini_parser.hpp>
 #include <boost/algorithm/string/replace.hpp>
diff --git a/source/frontends/qapple/CMakeLists.txt b/source/frontends/qt/CMakeLists.txt
similarity index 100%
rename from source/frontends/qapple/CMakeLists.txt
rename to source/frontends/qt/CMakeLists.txt
diff --git a/source/frontends/qapple/QHexView b/source/frontends/qt/QHexView
similarity index 100%
rename from source/frontends/qapple/QHexView
rename to source/frontends/qt/QHexView
diff --git a/source/frontends/qapple/applicationname.h b/source/frontends/qt/applicationname.h
similarity index 100%
rename from source/frontends/qapple/applicationname.h
rename to source/frontends/qt/applicationname.h
diff --git a/source/frontends/qapple/emulator.cpp b/source/frontends/qt/emulator.cpp
similarity index 100%
rename from source/frontends/qapple/emulator.cpp
rename to source/frontends/qt/emulator.cpp
diff --git a/source/frontends/qapple/emulator.h b/source/frontends/qt/emulator.h
similarity index 100%
rename from source/frontends/qapple/emulator.h
rename to source/frontends/qt/emulator.h
diff --git a/source/frontends/qapple/emulator.ui b/source/frontends/qt/emulator.ui
similarity index 100%
rename from source/frontends/qapple/emulator.ui
rename to source/frontends/qt/emulator.ui
diff --git a/source/frontends/qapple/gamepadpaddle.cpp b/source/frontends/qt/gamepadpaddle.cpp
similarity index 100%
rename from source/frontends/qapple/gamepadpaddle.cpp
rename to source/frontends/qt/gamepadpaddle.cpp
diff --git a/source/frontends/qapple/gamepadpaddle.h b/source/frontends/qt/gamepadpaddle.h
similarity index 100%
rename from source/frontends/qapple/gamepadpaddle.h
rename to source/frontends/qt/gamepadpaddle.h
diff --git a/source/frontends/qapple/loggingcategory.cpp b/source/frontends/qt/loggingcategory.cpp
similarity index 100%
rename from source/frontends/qapple/loggingcategory.cpp
rename to source/frontends/qt/loggingcategory.cpp
diff --git a/source/frontends/qapple/loggingcategory.h b/source/frontends/qt/loggingcategory.h
similarity index 100%
rename from source/frontends/qapple/loggingcategory.h
rename to source/frontends/qt/loggingcategory.h
diff --git a/source/frontends/qapple/main.cpp b/source/frontends/qt/main.cpp
similarity index 96%
rename from source/frontends/qapple/main.cpp
rename to source/frontends/qt/main.cpp
index b4ee4104..ad5dc13f 100644
--- a/source/frontends/qapple/main.cpp
+++ b/source/frontends/qt/main.cpp
@@ -6,7 +6,7 @@
 #include <QCommandLineParser>
 
 #include "linux/version.h"
-#include "frontends/qapple/applicationname.h"
+#include "applicationname.h"
 
 
 int main(int argc, char *argv[])
diff --git a/source/frontends/qapple/memorycontainer.cpp b/source/frontends/qt/memorycontainer.cpp
similarity index 100%
rename from source/frontends/qapple/memorycontainer.cpp
rename to source/frontends/qt/memorycontainer.cpp
diff --git a/source/frontends/qapple/memorycontainer.h b/source/frontends/qt/memorycontainer.h
similarity index 100%
rename from source/frontends/qapple/memorycontainer.h
rename to source/frontends/qt/memorycontainer.h
diff --git a/source/frontends/qapple/memorycontainer.ui b/source/frontends/qt/memorycontainer.ui
similarity index 100%
rename from source/frontends/qapple/memorycontainer.ui
rename to source/frontends/qt/memorycontainer.ui
diff --git a/source/frontends/qapple/options.cpp b/source/frontends/qt/options.cpp
similarity index 100%
rename from source/frontends/qapple/options.cpp
rename to source/frontends/qt/options.cpp
diff --git a/source/frontends/qapple/options.h b/source/frontends/qt/options.h
similarity index 100%
rename from source/frontends/qapple/options.h
rename to source/frontends/qt/options.h
diff --git a/source/frontends/qapple/preferences.cpp b/source/frontends/qt/preferences.cpp
similarity index 100%
rename from source/frontends/qapple/preferences.cpp
rename to source/frontends/qt/preferences.cpp
diff --git a/source/frontends/qapple/preferences.h b/source/frontends/qt/preferences.h
similarity index 100%
rename from source/frontends/qapple/preferences.h
rename to source/frontends/qt/preferences.h
diff --git a/source/frontends/qapple/preferences.ui b/source/frontends/qt/preferences.ui
similarity index 100%
rename from source/frontends/qapple/preferences.ui
rename to source/frontends/qt/preferences.ui
diff --git a/source/frontends/qapple/qapple.cpp b/source/frontends/qt/qapple.cpp
similarity index 100%
rename from source/frontends/qapple/qapple.cpp
rename to source/frontends/qt/qapple.cpp
diff --git a/source/frontends/qapple/qapple.h b/source/frontends/qt/qapple.h
similarity index 100%
rename from source/frontends/qapple/qapple.h
rename to source/frontends/qt/qapple.h
diff --git a/source/frontends/qapple/qapple.pro b/source/frontends/qt/qapple.pro
similarity index 100%
rename from source/frontends/qapple/qapple.pro
rename to source/frontends/qt/qapple.pro
diff --git a/source/frontends/qapple/qapple.qrc b/source/frontends/qt/qapple.qrc
similarity index 100%
rename from source/frontends/qapple/qapple.qrc
rename to source/frontends/qt/qapple.qrc
diff --git a/source/frontends/qapple/qapple.ui b/source/frontends/qt/qapple.ui
similarity index 100%
rename from source/frontends/qapple/qapple.ui
rename to source/frontends/qt/qapple.ui
diff --git a/source/frontends/qapple/qdirectsound.cpp b/source/frontends/qt/qdirectsound.cpp
similarity index 100%
rename from source/frontends/qapple/qdirectsound.cpp
rename to source/frontends/qt/qdirectsound.cpp
diff --git a/source/frontends/qapple/qdirectsound.h b/source/frontends/qt/qdirectsound.h
similarity index 100%
rename from source/frontends/qapple/qdirectsound.h
rename to source/frontends/qt/qdirectsound.h
diff --git a/source/frontends/qapple/qresources.cpp b/source/frontends/qt/qresources.cpp
similarity index 100%
rename from source/frontends/qapple/qresources.cpp
rename to source/frontends/qt/qresources.cpp
diff --git a/source/frontends/qapple/registry.cpp b/source/frontends/qt/registry.cpp
similarity index 100%
rename from source/frontends/qapple/registry.cpp
rename to source/frontends/qt/registry.cpp
diff --git a/source/frontends/qapple/registry.h b/source/frontends/qt/registry.h
similarity index 100%
rename from source/frontends/qapple/registry.h
rename to source/frontends/qt/registry.h
diff --git a/source/frontends/qapple/resources/APPLEWIN.ICO b/source/frontends/qt/resources/APPLEWIN.ICO
similarity index 100%
rename from source/frontends/qapple/resources/APPLEWIN.ICO
rename to source/frontends/qt/resources/APPLEWIN.ICO
diff --git a/source/frontends/qapple/resources/Apple2.rom b/source/frontends/qt/resources/Apple2.rom
similarity index 100%
rename from source/frontends/qapple/resources/Apple2.rom
rename to source/frontends/qt/resources/Apple2.rom
diff --git a/source/frontends/qapple/resources/Apple2_JPlus.rom b/source/frontends/qt/resources/Apple2_JPlus.rom
similarity index 100%
rename from source/frontends/qapple/resources/Apple2_JPlus.rom
rename to source/frontends/qt/resources/Apple2_JPlus.rom
diff --git a/source/frontends/qapple/resources/Apple2_JPlus_Video.rom b/source/frontends/qt/resources/Apple2_JPlus_Video.rom
similarity index 100%
rename from source/frontends/qapple/resources/Apple2_JPlus_Video.rom
rename to source/frontends/qt/resources/Apple2_JPlus_Video.rom
diff --git a/source/frontends/qapple/resources/Apple2_Plus.rom b/source/frontends/qt/resources/Apple2_Plus.rom
similarity index 100%
rename from source/frontends/qapple/resources/Apple2_Plus.rom
rename to source/frontends/qt/resources/Apple2_Plus.rom
diff --git a/source/frontends/qapple/resources/Apple2e.rom b/source/frontends/qt/resources/Apple2e.rom
similarity index 100%
rename from source/frontends/qapple/resources/Apple2e.rom
rename to source/frontends/qt/resources/Apple2e.rom
diff --git a/source/frontends/qapple/resources/Apple2e_Enhanced.rom b/source/frontends/qt/resources/Apple2e_Enhanced.rom
similarity index 100%
rename from source/frontends/qapple/resources/Apple2e_Enhanced.rom
rename to source/frontends/qt/resources/Apple2e_Enhanced.rom
diff --git a/source/frontends/qapple/resources/ApplewinLogo.bmp b/source/frontends/qt/resources/ApplewinLogo.bmp
similarity index 100%
rename from source/frontends/qapple/resources/ApplewinLogo.bmp
rename to source/frontends/qt/resources/ApplewinLogo.bmp
diff --git a/source/frontends/qapple/resources/Base64A.rom b/source/frontends/qt/resources/Base64A.rom
similarity index 100%
rename from source/frontends/qapple/resources/Base64A.rom
rename to source/frontends/qt/resources/Base64A.rom
diff --git a/source/frontends/qapple/resources/Base64A_German_Video.rom b/source/frontends/qt/resources/Base64A_German_Video.rom
similarity index 100%
rename from source/frontends/qapple/resources/Base64A_German_Video.rom
rename to source/frontends/qt/resources/Base64A_German_Video.rom
diff --git a/source/frontends/qapple/resources/CHARSET4.BMP b/source/frontends/qt/resources/CHARSET4.BMP
similarity index 100%
rename from source/frontends/qapple/resources/CHARSET4.BMP
rename to source/frontends/qt/resources/CHARSET4.BMP
diff --git a/source/frontends/qapple/resources/CHARSET82.bmp b/source/frontends/qt/resources/CHARSET82.bmp
similarity index 100%
rename from source/frontends/qapple/resources/CHARSET82.bmp
rename to source/frontends/qt/resources/CHARSET82.bmp
diff --git a/source/frontends/qapple/resources/CHARSET8C.bmp b/source/frontends/qt/resources/CHARSET8C.bmp
similarity index 100%
rename from source/frontends/qapple/resources/CHARSET8C.bmp
rename to source/frontends/qt/resources/CHARSET8C.bmp
diff --git a/source/frontends/qapple/resources/CHARSET8M.bmp b/source/frontends/qt/resources/CHARSET8M.bmp
similarity index 100%
rename from source/frontends/qapple/resources/CHARSET8M.bmp
rename to source/frontends/qt/resources/CHARSET8M.bmp
diff --git a/source/frontends/qapple/resources/DISK2-13sector.rom b/source/frontends/qt/resources/DISK2-13sector.rom
similarity index 100%
rename from source/frontends/qapple/resources/DISK2-13sector.rom
rename to source/frontends/qt/resources/DISK2-13sector.rom
diff --git a/source/frontends/qapple/resources/DISK2.rom b/source/frontends/qt/resources/DISK2.rom
similarity index 100%
rename from source/frontends/qapple/resources/DISK2.rom
rename to source/frontends/qt/resources/DISK2.rom
diff --git a/source/frontends/qapple/resources/Hddrvr.bin b/source/frontends/qt/resources/Hddrvr.bin
similarity index 100%
rename from source/frontends/qapple/resources/Hddrvr.bin
rename to source/frontends/qt/resources/Hddrvr.bin
diff --git a/source/frontends/qapple/resources/MouseInterface.rom b/source/frontends/qt/resources/MouseInterface.rom
similarity index 100%
rename from source/frontends/qapple/resources/MouseInterface.rom
rename to source/frontends/qt/resources/MouseInterface.rom
diff --git a/source/frontends/qapple/resources/PRAVETS82.ROM b/source/frontends/qt/resources/PRAVETS82.ROM
similarity index 100%
rename from source/frontends/qapple/resources/PRAVETS82.ROM
rename to source/frontends/qt/resources/PRAVETS82.ROM
diff --git a/source/frontends/qapple/resources/PRAVETS8C.ROM b/source/frontends/qt/resources/PRAVETS8C.ROM
similarity index 100%
rename from source/frontends/qapple/resources/PRAVETS8C.ROM
rename to source/frontends/qt/resources/PRAVETS8C.ROM
diff --git a/source/frontends/qapple/resources/PRAVETS8M.ROM b/source/frontends/qt/resources/PRAVETS8M.ROM
similarity index 100%
rename from source/frontends/qapple/resources/PRAVETS8M.ROM
rename to source/frontends/qt/resources/PRAVETS8M.ROM
diff --git a/source/frontends/qapple/resources/Parallel.rom b/source/frontends/qt/resources/Parallel.rom
similarity index 100%
rename from source/frontends/qapple/resources/Parallel.rom
rename to source/frontends/qt/resources/Parallel.rom
diff --git a/source/frontends/qapple/resources/TK3000e.rom b/source/frontends/qt/resources/TK3000e.rom
similarity index 100%
rename from source/frontends/qapple/resources/TK3000e.rom
rename to source/frontends/qt/resources/TK3000e.rom
diff --git a/source/frontends/qapple/video.cpp b/source/frontends/qt/video.cpp
similarity index 100%
rename from source/frontends/qapple/video.cpp
rename to source/frontends/qt/video.cpp
diff --git a/source/frontends/qapple/video.h b/source/frontends/qt/video.h
similarity index 100%
rename from source/frontends/qapple/video.h
rename to source/frontends/qt/video.h
diff --git a/source/frontends/qapple/viewbuffer.cpp b/source/frontends/qt/viewbuffer.cpp
similarity index 100%
rename from source/frontends/qapple/viewbuffer.cpp
rename to source/frontends/qt/viewbuffer.cpp
diff --git a/source/frontends/qapple/viewbuffer.h b/source/frontends/qt/viewbuffer.h
similarity index 100%
rename from source/frontends/qapple/viewbuffer.h
rename to source/frontends/qt/viewbuffer.h