diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index d3bcf65..65ad189 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -3,7 +3,7 @@
         {
             "name": "Win32",
             "includePath": [
-                "${workspaceFolder}\\dev\\VisualStudio\\",
+                "${workspaceFolder}\\dev\\",
                 "${workspaceFolder}\\lwshell\\src\\include\\"
             ],
             "defines": [
diff --git a/lwshell/CMakeLists.txt b/lwshell/CMakeLists.txt
index c44a17e..0b3fa46 100644
--- a/lwshell/CMakeLists.txt
+++ b/lwshell/CMakeLists.txt
@@ -1,20 +1,14 @@
 cmake_minimum_required(VERSION 3.13)
 
 # Debug message
-message("LWSHELL: Entering lib source CMakeLists.txt")
+message("Entering ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")
 
-# Set library name
-set(LWSHELL_LIB_NAME "lwshell")
+# Register core library
+add_library(lwshell INTERFACE)
+target_sources(lwshell PUBLIC ${CMAKE_CURRENT_LIST_DIR}/src/lwshell/lwshell.c)
+target_include_directories(lwshell INTERFACE ${CMAKE_CURRENT_LIST_DIR}/src/include)
 
-# Register library to the system
-add_library(${LWSHELL_LIB_NAME} INTERFACE)
+# Register other modules
 
-# Setup generic source files
-target_sources(${LWSHELL_LIB_NAME} INTERFACE
-    ${CMAKE_CURRENT_LIST_DIR}/src/lwshell/lwshell.c
-    )
-
-# Setup include directories
-target_include_directories(${LWSHELL_LIB_NAME} INTERFACE
-    ${CMAKE_CURRENT_LIST_DIR}/src/include
-    )
+# Debug message
+message("Exiting ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt")