diff --git a/layersvt/CMakeLists.txt b/layersvt/CMakeLists.txt
index 1ed2af86d9..2e5a64324d 100644
--- a/layersvt/CMakeLists.txt
+++ b/layersvt/CMakeLists.txt
@@ -108,16 +108,16 @@ if(BUILD_SCREENSHOT)
     add_library(VkLayer_screenshot MODULE)
     set_target_properties(VkLayer_screenshot PROPERTIES FOLDER "layers/screenshot")
     target_sources(VkLayer_screenshot PRIVATE
-        screenshot.cpp
-        screenshot_parsing.cpp
-        screenshot_parsing.h
+        screenshot/screenshot.cpp
+        screenshot/screenshot_parsing.cpp
+        screenshot/screenshot_parsing.h
         perfetto/perfetto.cc
-        perfetto/screenshots_perfetto_helpers.cpp
+        screenshot/screenshot_perfetto.cpp
         vk_layer_table.cpp
         vk_layer_table.h
-        screenshot_layer.md
+        screenshot/screenshot_layer.md
         layer_keep_alive.cpp
-        json/VkLayer_screenshot.json.in
+        screenshot/json/VkLayer_screenshot.json.in
     )
 endif()
 
@@ -215,6 +215,8 @@ foreach(layer ${TOOL_LAYERS})
         set(layer_dir "debug_marker/")
     elseif(layer STREQUAL "VkLayer_CPUTiming")
         set(layer_dir "cpu_timing/")
+    elseif(layer STREQUAL "VkLayer_screenshot")
+        set(layer_dir "screenshot/")
     else()
         set(layer_dir "")
     endif()
@@ -261,9 +263,13 @@ foreach(layer ${TOOL_LAYERS})
         set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/debug_marker/${layer}.json.in")
     elseif(layer STREQUAL "VkLayer_CPUTiming")
         set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/cpu_timing/${layer}.json.in")
+    elseif(layer STREQUAL "VkLayer_screenshot")
+        set(INPUT_FILE "${CMAKE_CURRENT_SOURCE_DIR}/screenshot/json/${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_screenshot.def b/layersvt/screenshot/VkLayer_screenshot.def
similarity index 100%
rename from layersvt/VkLayer_screenshot.def
rename to layersvt/screenshot/VkLayer_screenshot.def
diff --git a/layersvt/json/VkLayer_screenshot.json.in b/layersvt/screenshot/json/VkLayer_screenshot.json.in
similarity index 100%
rename from layersvt/json/VkLayer_screenshot.json.in
rename to layersvt/screenshot/json/VkLayer_screenshot.json.in
diff --git a/layersvt/screenshot.cpp b/layersvt/screenshot/screenshot.cpp
similarity index 99%
rename from layersvt/screenshot.cpp
rename to layersvt/screenshot/screenshot.cpp
index 8a1951f6d7..79958e1abf 100644
--- a/layersvt/screenshot.cpp
+++ b/layersvt/screenshot/screenshot.cpp
@@ -60,7 +60,7 @@
 
 #include "vk_layer_table.h"
 #include "screenshot_parsing.h"
-#include "perfetto/screenshots_perfetto_helpers.h"
+#include "screenshot_perfetto.h"
 #include "screenshot_writer.h"
 
 using namespace std;
diff --git a/layersvt/screenshot_layer.md b/layersvt/screenshot/screenshot_layer.md
similarity index 100%
rename from layersvt/screenshot_layer.md
rename to layersvt/screenshot/screenshot_layer.md
diff --git a/layersvt/screenshot_parsing.cpp b/layersvt/screenshot/screenshot_parsing.cpp
similarity index 100%
rename from layersvt/screenshot_parsing.cpp
rename to layersvt/screenshot/screenshot_parsing.cpp
diff --git a/layersvt/screenshot_parsing.h b/layersvt/screenshot/screenshot_parsing.h
similarity index 100%
rename from layersvt/screenshot_parsing.h
rename to layersvt/screenshot/screenshot_parsing.h
diff --git a/layersvt/perfetto/screenshots_perfetto_helpers.cpp b/layersvt/screenshot/screenshot_perfetto.cpp
similarity index 97%
rename from layersvt/perfetto/screenshots_perfetto_helpers.cpp
rename to layersvt/screenshot/screenshot_perfetto.cpp
index 672f33ae79..159e229b54 100644
--- a/layersvt/perfetto/screenshots_perfetto_helpers.cpp
+++ b/layersvt/screenshot/screenshot_perfetto.cpp
@@ -1,4 +1,4 @@
-#include "screenshots_perfetto_helpers.h"
+#include "screenshot_perfetto.h"
 #include <atomic>
 #include <thread>
 #include <mutex>
diff --git a/layersvt/perfetto/screenshots_perfetto_helpers.h b/layersvt/screenshot/screenshot_perfetto.h
similarity index 57%
rename from layersvt/perfetto/screenshots_perfetto_helpers.h
rename to layersvt/screenshot/screenshot_perfetto.h
index 4097e0de66..f44fbee7ba 100644
--- a/layersvt/perfetto/screenshots_perfetto_helpers.h
+++ b/layersvt/screenshot/screenshot_perfetto.h
@@ -1,7 +1,7 @@
-#ifndef LAYERSVT_SCREENSHOTS_PERFETTO_HELPERS_H
-#define LAYERSVT_SCREENSHOTS_PERFETTO_HELPERS_H
+#ifndef LAYERSVT_SCREENSHOT_PERFETTO_H
+#define LAYERSVT_SCREENSHOT_PERFETTO_H
 
-#include "perfetto.h"
+#include "perfetto/perfetto.h"
 
 class ScreenshotDataSource : public perfetto::DataSource<ScreenshotDataSource> {
    public:
@@ -11,4 +11,4 @@ class ScreenshotDataSource : public perfetto::DataSource<ScreenshotDataSource> {
 
 void InitializeScreenshotsPerfetto();
 
-#endif  // LAYERSVT_SCREENSHOTS_PERFETTO_HELPERS_H
+#endif  // LAYERSVT_SCREENSHOT_PERFETTO_H
diff --git a/layersvt/screenshot_writer.h b/layersvt/screenshot/screenshot_writer.h
similarity index 100%
rename from layersvt/screenshot_writer.h
rename to layersvt/screenshot/screenshot_writer.h