diff -r f5b526a3423a -r 07578e081ae8 CMakeLists.txt
--- a/CMakeLists.txt	Sat Jun 06 23:06:14 2015 +0300
+++ b/CMakeLists.txt	Sat Jun 06 23:12:59 2015 +0300
@@ -13,40 +13,39 @@
 
 include_directories (${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR})
 
-set (ZCINEMA_SOURCES
-	src/demo.cpp
-	src/main.cpp
-	src/prompts.cpp
+set (ZCINEMA_LAUNCHER_SOURCES
+	launcher/demo.cpp
+	launcher/main.cpp
+	launcher/prompts.cpp
 )
 
 set (ZCINEMA_COMMON_SOURCES
-	src-common/config.cpp
-	src-common/misc.cpp
-	src-common/version.cpp
+	commonlib/config.cpp
+	commonlib/misc.cpp
+	commonlib/version.cpp
 )
 
 set (ZCINEMA_CONFIG_SOURCES
-	src-config/configwindow.cpp
-	src-config/addversionprompt.cpp
-	src-config/main.cpp
+	config/configwindow.cpp
+	config/addversionprompt.cpp
+	config/main.cpp
 )
 
 set (ZCINEMA_HEADERS
-	src-common/config.h
-	src-common/misc.h
-	src-common/types.h
-	src-common/version.h
-	src-config/addversionprompt.h
-	src-config/configwindow.h
-	src/demo.h
-	src/prompts.h
+	commonlib/config.h
+	commonlib/misc.h
+	commonlib/types.h
+	commonlib/version.h
+	config/addversionprompt.h
+	config/configwindow.h
+	launcher/demo.h
+	launcher/prompts.h
 )
 
 set (ZCINEMA_FORMS
 	ui/findfile.ui
 	ui/demoprompt.ui
 	ui/unknownversion.ui
-	ui/versionEditor.ui
 	ui/configbox.ui
 	ui/addversion.ui
 )
@@ -58,12 +57,7 @@
 endif()
 
 include_directories ("${PROJECT_BINARY_DIR}")
-include_directories ("${PROJECT_SOURCE_DIR}/src")
-include_directories ("${PROJECT_BINARY_DIR}/src")
-include_directories ("${PROJECT_SOURCE_DIR}/src-common")
-include_directories ("${PROJECT_BINARY_DIR}/src-common")
-include_directories ("${PROJECT_SOURCE_DIR}/src-config")
-include_directories ("${PROJECT_BINARY_DIR}/src-config")
+include_directories ("${PROJECT_SOURCE_DIR}")
 
 if (USE_QT5)
 	qt5_generate_moc (ZCINEMA_MOC ${ZCINEMA_HEADERS})
@@ -87,7 +81,7 @@
 		${ZCINEMA_FORMS_HEADERS})
 endif()
 
-add_executable (${PROJECT_NAME} WIN32 ${ZCINEMA_SOURCES})
+add_executable (${PROJECT_NAME} WIN32 ${ZCINEMA_LAUNCHER_SOURCES})
 add_executable (${PROJECT_NAME}-config WIN32 ${ZCINEMA_CONFIG_SOURCES})
 
 if (USE_QT5)