diff --git a/CMakeLists.txt b/CMakeLists.txt
index 52525ce5..5315c852 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -94,6 +94,9 @@ set( CMAKE_CXX_STANDARD 17 )
 set( CMAKE_CXX_STANDARD_REQUIRED ON )
 set( CMAKE_CXX_EXTENSIONS OFF )
 
+# Enable project folders in VS
+set_property( GLOBAL PROPERTY USE_FOLDERS ON )
+
 set( C_CXX_COMPILER_FLAGS "" )			# Flags for C and C++ compilers
 set( GAME_LINKER_FLAGS "" )				# Flags for Game DLL linker
 
@@ -450,6 +453,11 @@ if( USE_UPDATER )
 	)
 endif()
 
+#-----------------------------------------------------------------
+# BHL Targets
+#-----------------------------------------------------------------
+set( CMAKE_FOLDER "HL SDK" )
+
 #-----------------------------------------------------------------
 # Client library
 #-----------------------------------------------------------------
diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt
index 11e4d8c4..1b8ef71d 100644
--- a/external/CMakeLists.txt
+++ b/external/CMakeLists.txt
@@ -1,3 +1,5 @@
+set( CMAKE_FOLDER "External" )
+
 add_subdirectory( glad )
 add_subdirectory( nlohmann_json )
 add_subdirectory( pcre )
diff --git a/source_sdk b/source_sdk
index be83f1c5..ccd11205 160000
--- a/source_sdk
+++ b/source_sdk
@@ -1 +1 @@
-Subproject commit be83f1c511604810da58ba2d934bc4aefaf52864
+Subproject commit ccd1120509d74a8120a6331791b91b98cb515f29