diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5b0a3eda6..be028a9fc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -382,11 +382,7 @@ target_link_libraries(libid PRIVATE helpcom os config Boost::boost)
 target_link_libraries(libid PUBLIC config)
 add_dependencies(libid native_help)
 
-add_executable(id ${ID_EXECUTABLE_TYPE}
-    common/main.cpp
-)
-target_link_libraries(id PUBLIC libid)
-install(TARGETS id DESTINATION bin)
+add_subdirectory(id)
 
 set_property(DIRECTORY PROPERTY VS_STARTUP_PROJECT id)
 
diff --git a/id/CMakeLists.txt b/id/CMakeLists.txt
new file mode 100644
index 000000000..927391acd
--- /dev/null
+++ b/id/CMakeLists.txt
@@ -0,0 +1,5 @@
+add_executable(id ${ID_EXECUTABLE_TYPE}
+    main.cpp
+)
+target_link_libraries(id PUBLIC libid)
+install(TARGETS id DESTINATION bin)
diff --git a/common/main.cpp b/id/main.cpp
similarity index 100%
rename from common/main.cpp
rename to id/main.cpp