diff --git a/moo/CMakeLists.txt b/moo/CMakeLists.txt
index 36d2b188..52fe9557 100644
--- a/moo/CMakeLists.txt
+++ b/moo/CMakeLists.txt
@@ -83,7 +83,6 @@ macro(ADD_MODULE name)
     #source_group(${name}\\generated FILES ${built_${_escaped_name}_sources})
     LIST(APPEND MEDIT_SOURCES ${${_escaped_name}_sources} ${built_${_escaped_name}_sources})
     LIST(APPEND MEDIT_EXTRA_DIST ${${_escaped_name}_extra_dist} ${${_escaped_name}_extra_files})
-    message(STATUS "built_${_escaped_name}_sources: ${built_${_escaped_name}_sources}")
 endmacro(ADD_MODULE)
 
 ADD_MODULE(xdgmime)
@@ -107,6 +106,11 @@ include_directories(
 )
 link_directories(${GTK_LIBRARY_DIRS} ${GMODULE_LIBRARY_DIRS})
 
+source_group(misc REGULAR_EXPRESSION .*)
+source_group("generated\\sources" REGULAR_EXPRESSION ".*\\.c(pp)?$")
+source_group("generated\\headers" REGULAR_EXPRESSION ".*\\.h$")
+source_group("misc\\glade" REGULAR_EXPRESSION ".*\\.glade$")
+
 add_executable(medit WIN32
     ${MEDIT_SOURCES}
 )
diff --git a/moo/eggsmclient/eggsmclient.cmake b/moo/eggsmclient/eggsmclient.cmake
index 1e6de3b3..57e0bc67 100644
--- a/moo/eggsmclient/eggsmclient.cmake
+++ b/moo/eggsmclient/eggsmclient.cmake
@@ -1,4 +1,5 @@
 SET(eggsmclient_sources
+    eggsmclient/eggsmclient.cmake
     eggsmclient/eggsmclient.c
     eggsmclient/eggsmclient.h
     eggsmclient/eggsmclient-mangle.h
diff --git a/moo/gtksourceview/gtksourceview.cmake b/moo/gtksourceview/gtksourceview.cmake
index d9b9bfa5..56998bb5 100644
--- a/moo/gtksourceview/gtksourceview.cmake
+++ b/moo/gtksourceview/gtksourceview.cmake
@@ -1,4 +1,5 @@
 SET(gtksourceview_sources
+    gtksourceview/gtksourceview.cmake
     gtksourceview/gtksourcecontextengine.c
     gtksourceview/gtksourcecontextengine.h
     gtksourceview/gtksourceengine.c
diff --git a/moo/mooapp/mooapp.cmake b/moo/mooapp/mooapp.cmake
index 9ddf74fc..34d4c35c 100644
--- a/moo/mooapp/mooapp.cmake
+++ b/moo/mooapp/mooapp.cmake
@@ -1,4 +1,5 @@
 SET(mooapp_sources 
+    mooapp/mooapp.cmake
     mooapp/mooappabout.c
     mooapp/mooappabout.h
     mooapp/mooapp.c
diff --git a/moo/mooedit/mooedit.cmake b/moo/mooedit/mooedit.cmake
index 3e90c5df..e9af8c61 100644
--- a/moo/mooedit/mooedit.cmake
+++ b/moo/mooedit/mooedit.cmake
@@ -1,6 +1,7 @@
 LIST(APPEND moo_edit_enum_headers mooedit/mooedit-enums.h)
 
 SET(mooedit_sources
+    mooedit/mooedit.cmake
     ${moo_edit_enum_headers}
     mooedit/mooeditor.h
     mooedit/mootextview.h
diff --git a/moo/moofileview/moofileview.cmake b/moo/moofileview/moofileview.cmake
index ea37f4b3..6bb618ba 100644
--- a/moo/moofileview/moofileview.cmake
+++ b/moo/moofileview/moofileview.cmake
@@ -1,4 +1,5 @@
 SET(moofileview_sources
+    moofileview/moofileview.cmake
     moofileview/moobookmarkmgr.c
     moofileview/moobookmarkmgr.h
     moofileview/moobookmarkview.c
diff --git a/moo/moolua/lua/lua.cmake b/moo/moolua/lua/lua.cmake
index 590d9eae..0d94c6f9 100644
--- a/moo/moolua/lua/lua.cmake
+++ b/moo/moolua/lua/lua.cmake
@@ -9,6 +9,7 @@ LIST(APPEND moo_libadd -ldl)
 endif(MOO_OS_DARWIN)
 
 LIST(APPEND moolua_sources
+    moolua/lua/lua.cmake
     moolua/lua/lfs.h
     moolua/lua/lfs.cpp
     moolua/lua/moolua.h
diff --git a/moo/moolua/moolua.cmake b/moo/moolua/moolua.cmake
index e9519ae5..a4d95c51 100644
--- a/moo/moolua/moolua.cmake
+++ b/moo/moolua/moolua.cmake
@@ -1,4 +1,5 @@
 SET(moolua_sources
+    moolua/moolua.cmake
     moolua/medit-lua.h
     moolua/medit-lua.cpp
     moolua/mooluaplugin.cpp
@@ -10,6 +11,12 @@ SET(moolua_sources
     moolua/gtk-lua-api.h
 )
 
+SET(moolua_extra_files
+    moolua/lua-default-init.lua
+    moolua/lua-module-init.lua
+    moolua/lua-plugin-init.lua
+)
+
 SET(genlua_files
     ${CMAKE_SOURCE_DIR}/api/genlua.py
     ${CMAKE_SOURCE_DIR}/api/mpi/__init__.py
diff --git a/moo/mooutils/mooutils.cmake b/moo/mooutils/mooutils.cmake
index daa71d6b..21e2f2ea 100644
--- a/moo/mooutils/mooutils.cmake
+++ b/moo/mooutils/mooutils.cmake
@@ -6,6 +6,7 @@ SET(moo_utils_enum_headers
 )
 
 SET(mooutils_sources
+	mooutils/mooutils.cmake
 	${moo_utils_enum_headers}
 	mooutils/mooarray.h
 	mooutils/mooutils-thread.c
diff --git a/moo/plugins/plugins.cmake b/moo/plugins/plugins.cmake
index a843c5ca..1ff766e0 100644
--- a/moo/plugins/plugins.cmake
+++ b/moo/plugins/plugins.cmake
@@ -1,4 +1,5 @@
 SET(plugins_sources
+    plugins/plugins.cmake
     plugins/moofileselector-prefs.c
     plugins/moofileselector.c
     plugins/moofileselector.h
diff --git a/moo/plugins/usertools/usertools.cmake b/moo/plugins/usertools/usertools.cmake
index 88979b09..0d9fc677 100644
--- a/moo/plugins/usertools/usertools.cmake
+++ b/moo/plugins/usertools/usertools.cmake
@@ -26,6 +26,8 @@ foreach(input_file
     ADD_GXML(${input_file})
 endforeach(input_file)
 
+LIST(APPEND plugins_extra_files plugins/usertools/lua-tool-setup.lua)
+
 XML2H(plugins/usertools/lua-tool-setup.lua plugins/usertools/lua-tool-setup.h LUA_TOOL_SETUP_LUA)
 
 # EXTRA_DIST +=						\
diff --git a/moo/xdgmime/xdgmime.cmake b/moo/xdgmime/xdgmime.cmake
index 09a9b3a0..2aebaa77 100644
--- a/moo/xdgmime/xdgmime.cmake
+++ b/moo/xdgmime/xdgmime.cmake
@@ -1,4 +1,5 @@
 SET(xdgmime_sources
+    xdgmime/xdgmime.cmake
     xdgmime/xdgmimealias.c
     xdgmime/xdgmimealias.h
     xdgmime/xdgmime.c