diff --git a/CMakeLists.txt b/CMakeLists.txt
index ffcb3829..033b84e9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,6 +42,7 @@ add_subdirectory(sql)
 add_subdirectory(theming)
 add_subdirectory(ui)
 add_subdirectory(help)
+add_subdirectory(desktop)
 
 #
 # Uninstall target
diff --git a/src/client/CMakeLists.txt b/desktop/CMakeLists.txt
similarity index 96%
rename from src/client/CMakeLists.txt
rename to desktop/CMakeLists.txt
index 6136713f..9bb4376c 100644
--- a/src/client/CMakeLists.txt
+++ b/desktop/CMakeLists.txt
@@ -3,7 +3,7 @@
 #
 install(
     FILES
-        misc/geary.desktop
+        geary.desktop
     DESTINATION
         share/applications
 )
diff --git a/src/client/misc/geary.desktop b/desktop/geary.desktop
similarity index 100%
rename from src/client/misc/geary.desktop
rename to desktop/geary.desktop
diff --git a/src/client/misc/org.yorba.geary.gschema.xml b/desktop/org.yorba.geary.gschema.xml
similarity index 100%
rename from src/client/misc/org.yorba.geary.gschema.xml
rename to desktop/org.yorba.geary.gschema.xml
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index eea8e1b8..6892668c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -338,7 +338,7 @@ set(DBUSSERVICE_PACKAGES
     gee-1.0 glib-2.0
 )
 
-set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/src/client/misc)
+set(GSETTINGS_DIR ${CMAKE_SOURCE_DIR}/desktop)
 
 set(CFLAGS 
     ${DEPS_CFLAGS}
@@ -408,13 +408,11 @@ add_custom_command(
 )
 
 # GSettings
-# This needs to be here and not in client/CMakeLists.txt in order for Geary to run in the build
+# This needs to be here and not in desktop/CMakeLists.txt in order for Geary to run in the build
 # directory
 include(GSettings)
 add_schemas(geary ${GSETTINGS_DIR})
 
-add_subdirectory(client)
-
 # Console app
 #################################################
 vala_precompile(CONSOLE_VALA_C geary-console
diff --git a/src/client/geary-application.vala b/src/client/geary-application.vala
index 18ce14c6..5b1ee3b3 100644
--- a/src/client/geary-application.vala
+++ b/src/client/geary-application.vala
@@ -484,7 +484,7 @@ along with Geary; if not, write to the Free Software Foundation, Inc.,
     public File? get_desktop_file() {
         File desktop_file = is_installed()
             ? File.new_for_path(INSTALL_PREFIX).get_child("share/applications/geary.desktop")
-            : File.new_for_path(SOURCE_ROOT_DIR).get_child("src/client/misc/geary.desktop");
+            : File.new_for_path(SOURCE_ROOT_DIR).get_child("desktop/geary.desktop");
         
         return desktop_file.query_exists() ? desktop_file : null;
     }