diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt
index da2c37250e..fe3114b764 100644
--- a/layersvt/CMakeLists.txt
+++ b/layersvt/CMakeLists.txt
@@ -161,19 +161,25 @@ if(BUILD_DEBUGMARKER)
     add_library(VkLayer_DebugMarker MODULE)
     set_target_properties(VkLayer_DebugMarker PROPERTIES FOLDER "layers/debugmarker")
     target_sources(VkLayer_DebugMarker PRIVATE
-        debug_marker_handwritten_dispatch.cpp
-        debug_marker_handwritten_functions.h
-        debug_marker_handwritten_functions_vk_ext_debug_marker.h
-        debug_marker_handwritten_functions_vk_ext_debug_utils.h
-        debug_marker.h
-        debug_marker.cpp
-        debug_marker_perfetto.h
-        debug_marker_perfetto.cpp
+        debug_marker/debug_marker_handwritten_dispatch.cpp
+        debug_marker/debug_marker_handwritten_functions.h
+        debug_marker/debug_marker_handwritten_functions_vk_ext_debug_marker.h
+        debug_marker/debug_marker_handwritten_functions_vk_ext_debug_utils.h
+        debug_marker/debug_marker.h
+        debug_marker/debug_marker.cpp
+        debug_marker/debug_marker_perfetto.h
+        debug_marker/debug_marker_perfetto.cpp
         perfetto/perfetto.cc
         vk_layer_table.cpp
         vk_layer_table.h
         layer_keep_alive.cpp
-        json/VkLayer_DebugMarker.json.in
+        debug_marker/VkLayer_DebugMarker.json.in
+    )
+
+    target_include_directories(VkLayer_DebugMarker PRIVATE
+        ${CMAKE_CURRENT_SOURCE_DIR}
+        ${CMAKE_CURRENT_SOURCE_DIR}/debug_marker
+        ${CMAKE_CURRENT_BINARY_DIR}
     )
 
     if(CMAKE_SYSTEM_NAME MATCHES "Linux|BSD|DragonFly|GNU")
@@ -199,6 +205,12 @@ foreach(layer ${TOOL_LAYERS})
         continue()
     endif()
 
+    if (layer STREQUAL "VkLayer_DebugMarker")
+        set(layer_dir "debug_marker/")
+    else()
+        set(layer_dir "")
+    endif()
+
     target_link_Libraries(${layer} PRIVATE Vulkan::Headers Vulkan::UtilityHeaders Vulkan::LayerSettings)
 
     if (ANDROID)
@@ -212,9 +224,9 @@ foreach(layer ${TOOL_LAYERS})
     target_include_directories(${layer} PRIVATE .)
 
     if (MSVC)
-        target_link_options(${layer} PRIVATE /DEF:${CMAKE_CURRENT_SOURCE_DIR}/${layer}.def)
+        target_link_options(${layer} PRIVATE /DEF:${CMAKE_CURRENT_SOURCE_DIR}/${layer_dir}${layer}.def)
     elseif(MINGW)
-        target_sources(${layer} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${layer}.def)
+        target_sources(${layer} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/${layer_dir}${layer}.def)
         target_compile_definitions(${layer} PRIVATE uid_t=int)
     endif()
 
@@ -237,7 +249,11 @@ foreach(layer ${TOOL_LAYERS})
         continue()
     endif()
 
-    set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/json/${layer}.json.in")
+    if (layer STREQUAL "VkLayer_DebugMarker")
+        set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/debug_marker/${layer}.json.in")
+    else()
+        set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/json/${layer}.json.in")
+    endif()
     set(INTERMEDIATE_FILE "${CMAKE_CURRENT_BINARY_DIR}/json/intermediate-${layer}.json")
     set(OUTPUT_FILE_FINAL_NAME "${layer}.json")
     set(LAYER_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR})
diff --git a/layersvt/VkLayer_DebugMarker.def b/layersvt/debug_marker/VkLayer_DebugMarker.def
similarity index 100%
rename from layersvt/VkLayer_DebugMarker.def
rename to layersvt/debug_marker/VkLayer_DebugMarker.def
diff --git a/layersvt/json/VkLayer_DebugMarker.json.in b/layersvt/debug_marker/VkLayer_DebugMarker.json.in
similarity index 100%
rename from layersvt/json/VkLayer_DebugMarker.json.in
rename to layersvt/debug_marker/VkLayer_DebugMarker.json.in
diff --git a/layersvt/debug_marker.cpp b/layersvt/debug_marker/debug_marker.cpp
similarity index 100%
rename from layersvt/debug_marker.cpp
rename to layersvt/debug_marker/debug_marker.cpp
diff --git a/layersvt/debug_marker.h b/layersvt/debug_marker/debug_marker.h
similarity index 100%
rename from layersvt/debug_marker.h
rename to layersvt/debug_marker/debug_marker.h
diff --git a/layersvt/debug_marker_handwritten_dispatch.cpp b/layersvt/debug_marker/debug_marker_handwritten_dispatch.cpp
similarity index 100%
rename from layersvt/debug_marker_handwritten_dispatch.cpp
rename to layersvt/debug_marker/debug_marker_handwritten_dispatch.cpp
diff --git a/layersvt/debug_marker_handwritten_functions.h b/layersvt/debug_marker/debug_marker_handwritten_functions.h
similarity index 100%
rename from layersvt/debug_marker_handwritten_functions.h
rename to layersvt/debug_marker/debug_marker_handwritten_functions.h
diff --git a/layersvt/debug_marker_handwritten_functions_vk_ext_debug_marker.h b/layersvt/debug_marker/debug_marker_handwritten_functions_vk_ext_debug_marker.h
similarity index 100%
rename from layersvt/debug_marker_handwritten_functions_vk_ext_debug_marker.h
rename to layersvt/debug_marker/debug_marker_handwritten_functions_vk_ext_debug_marker.h
diff --git a/layersvt/debug_marker_handwritten_functions_vk_ext_debug_utils.h b/layersvt/debug_marker/debug_marker_handwritten_functions_vk_ext_debug_utils.h
similarity index 100%
rename from layersvt/debug_marker_handwritten_functions_vk_ext_debug_utils.h
rename to layersvt/debug_marker/debug_marker_handwritten_functions_vk_ext_debug_utils.h
diff --git a/layersvt/debug_marker_perfetto.cpp b/layersvt/debug_marker/debug_marker_perfetto.cpp
similarity index 100%
rename from layersvt/debug_marker_perfetto.cpp
rename to layersvt/debug_marker/debug_marker_perfetto.cpp
diff --git a/layersvt/debug_marker_perfetto.h b/layersvt/debug_marker/debug_marker_perfetto.h
similarity index 100%
rename from layersvt/debug_marker_perfetto.h
rename to layersvt/debug_marker/debug_marker_perfetto.h
diff --git a/layersvt/test/CMakeLists.txt b/layersvt/test/CMakeLists.txt
index d1c2e3761d..ee14406ea3 100644
--- a/layersvt/test/CMakeLists.txt
+++ b/layersvt/test/CMakeLists.txt
@@ -35,7 +35,8 @@ function(LayerTest NAME)
     add_dependencies(${TEST_NAME} VkLayer_${NAME})
     target_link_libraries(${TEST_NAME} Vulkan::Headers Vulkan::Loader GTest::gtest GTest::gtest_main Vulkan::LayerSettings)
     if (${NAME} STREQUAL "DebugMarker")
-        target_sources(${TEST_NAME} PRIVATE ../debug_marker.cpp ../debug_marker_perfetto.cpp ../perfetto/perfetto.cc)
+        target_sources(${TEST_NAME} PRIVATE ../debug_marker/debug_marker.cpp ../debug_marker/debug_marker_perfetto.cpp ../perfetto/perfetto.cc)
+        target_include_directories(${TEST_NAME} PRIVATE .. ../debug_marker)
     endif()
     target_compile_definitions(${TEST_NAME} PUBLIC LAYER_BINARY_PATH="$<TARGET_FILE_DIR:VkLayer_${NAME}>")
     add_test(NAME ${TEST_NAME} COMMAND ${TEST_NAME})
diff --git a/layersvt/test/test_debugmarker.cpp b/layersvt/test/test_debugmarker.cpp
index 4c21293bee..e1f2325d2f 100644
--- a/layersvt/test/test_debugmarker.cpp
+++ b/layersvt/test/test_debugmarker.cpp
@@ -14,7 +14,7 @@
  */
 
 #include "layer_test_helper.h"
-#include "../debug_marker.h"
+#include "../debug_marker/debug_marker.h"
 #include <vulkan/vulkan_core.h>
 #include <gtest/gtest.h>
 #include <stdlib.h>