diff --git a/qad/blockview/CMakeLists.txt b/qad/blockview/CMakeLists.txt
index 9ad84a1..7ee2606 100644
--- a/qad/blockview/CMakeLists.txt
+++ b/qad/blockview/CMakeLists.txt
@@ -1,2 +1,3 @@
 set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils)
 qad_project(blockview "${LIBS}")
+add_subdirectory(blockeditor)
\ No newline at end of file
diff --git a/qad/blockview/blockeditor/CMakeLists.txt b/qad/blockview/blockeditor/CMakeLists.txt
new file mode 100644
index 0000000..95b1282
--- /dev/null
+++ b/qad/blockview/blockeditor/CMakeLists.txt
@@ -0,0 +1,21 @@
+qt_project(blockeditor BLOCKEDITOR_H BLOCKEDITOR_H)
+add_executable(${PROJECT_NAME} WIN32 ${BLOCKEDITOR_H} ${BLOCKEDITOR_H})
+set(LIBS ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} qad_widgets qad_utils qad_blockview)
+target_link_libraries(${PROJECT_NAME} ${LIBS})
+message(STATUS "Building ${PROJECT_NAME}")
+if(LIB)
+	if(WIN32)
+		install(TARGETS ${PROJECT_NAME} DESTINATION ${MINGW_BIN})
+	else()
+		if(APPLE)
+			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/local/bin)
+		else()
+			install(TARGETS ${PROJECT_NAME} DESTINATION /usr/bin)
+		endif()
+	endif()
+	message(STATUS "Install to system \"${CMAKE_INSTALL_PREFIX}\"")
+else()
+	install(TARGETS ${PROJECT_NAME} DESTINATION bin)
+	message(STATUS "Install to local \"bin\"")
+endif()
+
diff --git a/qad/blockview/blockeditor.cpp b/qad/blockview/blockeditor/blockeditor.cpp
similarity index 100%
rename from qad/blockview/blockeditor.cpp
rename to qad/blockview/blockeditor/blockeditor.cpp
diff --git a/qad/blockview/blockeditor.h b/qad/blockview/blockeditor/blockeditor.h
similarity index 100%
rename from qad/blockview/blockeditor.h
rename to qad/blockview/blockeditor/blockeditor.h
diff --git a/qad/blockview/blockeditor.ui b/qad/blockview/blockeditor/blockeditor.ui
similarity index 100%
rename from qad/blockview/blockeditor.ui
rename to qad/blockview/blockeditor/blockeditor.ui
diff --git a/qad/blockview/blockeditor_main.cpp b/qad/blockview/blockeditor/blockeditor_main.cpp
similarity index 100%
rename from qad/blockview/blockeditor_main.cpp
rename to qad/blockview/blockeditor/blockeditor_main.cpp