7 files changed, 8 insertions, 8 deletions
diff --git a/lib/nes/app/application.hh b/lib/nes/app/application.hh
index ddeff85..66b5206 100644
--- a/lib/nes/app/application.hh
+++ b/lib/nes/app/application.hh
@@ -7,7 +7,7 @@
 #include "nes/app/ui/screen-error.hh"
 #include "nes/app/ui/screen-confirm-quit.hh"
 #include "nes/sys/nes.hh"
-#include "nes/common/box.hh"
+#include "nes/common/containers/box.hh"
 #include "nes/common/display.hh"
 #include "nes/common/types.hh"
 #include <chrono>
diff --git a/lib/nes/app/file-browser.hh b/lib/nes/app/file-browser.hh
index d956c80..1fc7616 100644
--- a/lib/nes/app/file-browser.hh
+++ b/lib/nes/app/file-browser.hh
@@ -1,7 +1,7 @@
 #pragma once
 
+#include "nes/common/containers/span.hh"
 #include "nes/common/types.hh"
-#include "nes/common/span.hh"
 #include "nes/common/status.hh"
 #include <string_view>
 
diff --git a/lib/nes/app/graphics/renderer.hh b/lib/nes/app/graphics/renderer.hh
index 83cafb3..d4d7cc4 100644
--- a/lib/nes/app/graphics/renderer.hh
+++ b/lib/nes/app/graphics/renderer.hh
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "nes/common/types.hh"
 #include "nes/app/graphics/color.hh"
 #include "nes/app/graphics/text-attributes.hh"
-#include "nes/common/string-builder.hh"
+#include "nes/common/containers/string-builder.hh"
+#include "nes/common/types.hh"
 #include <string_view>
 
 namespace nes
diff --git a/lib/nes/app/input/input-buffer.hh b/lib/nes/app/input/input-buffer.hh
index 319cfa9..755a5c7 100644
--- a/lib/nes/app/input/input-buffer.hh
+++ b/lib/nes/app/input/input-buffer.hh
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nes/app/input/key.hh"
-#include "nes/common/list.hh"
+#include "nes/common/containers/list.hh"
 
 namespace nes::app
 {
diff --git a/lib/nes/app/input/input-device-controller.hh b/lib/nes/app/input/input-device-controller.hh
index b4e6570..69dd2a8 100644
--- a/lib/nes/app/input/input-device-controller.hh
+++ b/lib/nes/app/input/input-device-controller.hh
@@ -1,7 +1,7 @@
 #pragma once
 
 #include "nes/app/input/input-device.hh"
-#include "nes/common/list.hh"
+#include "nes/common/containers/list.hh"
 #include <string_view>
 
 namespace nes::app
diff --git a/lib/nes/app/input/input-manager.hh b/lib/nes/app/input/input-manager.hh
index 8bc75b8..b0b60e8 100644
--- a/lib/nes/app/input/input-manager.hh
+++ b/lib/nes/app/input/input-manager.hh
@@ -2,7 +2,7 @@
 
 #include "nes/app/input/input-device-keyboard.hh"
 #include "nes/app/input/input-device-controller.hh"
-#include "nes/common/list.hh"
+#include "nes/common/containers/list.hh"
 #include "nes/common/types.hh"
 
 namespace nes::app
diff --git a/lib/nes/app/ui/screen-browser.cc b/lib/nes/app/ui/screen-browser.cc
index a82e96d..4643e1c 100644
--- a/lib/nes/app/ui/screen-browser.cc
+++ b/lib/nes/app/ui/screen-browser.cc
@@ -3,7 +3,7 @@
 #include "nes/app/graphics/color.hh"
 #include "nes/app/graphics/tiles/icons.hh"
 #include "nes/app/input/input-device-keyboard.hh"
-#include "nes/common/path-view.hh"
+#include "nes/common/containers/path-view.hh"
 
 namespace nes::app
 {