diff --git a/Modules/Core/ComponentInterface/CMakeLists.txt b/Modules/Core/ComponentInterface/CMakeLists.txt
deleted file mode 100644
index 1eb65d8d0370331e841b5d9372422098f7d696bf..0000000000000000000000000000000000000000
--- a/Modules/Core/ComponentInterface/CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-PROJECT(componenthandshake)
-cmake_minimum_required(VERSION 2.8)
-cmake_policy(VERSION 2.8)
-ADD_DEFINITIONS(
-    -std=c++11
-    )
-#set(CMAKE_CXX_STANDARD 11)
-file(GLOB componenthandshake_SRC
-    "*.h"
-    "*.cxx"
-	"*.hxx"
-)
-ADD_EXECUTABLE(componenthandshake ${componenthandshake_SRC})
\ No newline at end of file
diff --git a/Modules/Core/elxModuleCore.cmake b/Modules/Core/elxModuleCore.cmake
index f0db2453ac04f145970f8d3a8691f5a432a2e261..caf59ad87c0bdfc7142575360af608666e4faeea 100644
--- a/Modules/Core/elxModuleCore.cmake
+++ b/Modules/Core/elxModuleCore.cmake
@@ -7,6 +7,8 @@ set( ${MODULE}_INCLUDE_DIRS
   ${${MODULE}_SOURCE_DIR}/ComponentInterface/include
 )
 
+source_group("MyHeaders" FILES ${${MODULE}_SOURCE_DIR}/ComponentInterface/include/ComponentBase.h)
+
 # Export libraries
 set( ${MODULE}_LIBRARIES 
   ${MODULE}
@@ -23,7 +25,6 @@ set( ${MODULE}_SOURCE_FILES
   ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/Metric4thPartyWrapper.cxx
   ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/SSDMetric3rdPartyComponent.cxx
   ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/SSDMetric4thPartyComponent.cxx
-  ${${MODULE}_SOURCE_DIR}/ComponentInterface/src/componenthandshake.cxx
 )