diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 45abebf..b77f41b 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -99,9 +99,9 @@ add_executable(tests_run
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/aes128.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/ps3/ps3_crypto.c
     ${CMAKE_CURRENT_SOURCE_DIR}/../src/ps3/ps3_encryption_map.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../tool/ird.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../tool/sfo.c
-    ${CMAKE_CURRENT_SOURCE_DIR}/../tool/iso9660_mini.c
+               ../tool/ps3/ird.c
+               ../tool/ps3/sfo.c
+               ../tool/ps3/iso9660_mini.c
 )
 
 # Set up include directories using modern target-specific approach
diff --git a/tool/CMakeLists.txt b/tool/CMakeLists.txt
index 4b61e88..ffe74e6 100644
--- a/tool/CMakeLists.txt
+++ b/tool/CMakeLists.txt
@@ -28,16 +28,16 @@ add_executable(aaruformattool
                convert.c
                upgrade_ddt_to_alpha21.c
                inject_media_tag.c
-               ird.c
-               ird.h
-               sfo.c
-               sfo.h
-               iso9660_mini.c
-               iso9660_mini.h
-               convert_ps3.c
-               convert_wiiu.c
-               wiiu_reader.c
-               wiiu_reader.h
+               ps3/ird.c
+               ps3/ird.h
+               ps3/sfo.c
+               ps3/sfo.h
+               ps3/iso9660_mini.c
+               ps3/iso9660_mini.h
+               ps3/convert.c
+               wiiu/convert.c
+               wiiu/reader.c
+               wiiu/reader.h
                ${CMAKE_CURRENT_SOURCE_DIR}/../src/lib/aes128.c
                ${CMAKE_CURRENT_SOURCE_DIR}/../src/ps3/ps3_crypto.c
                ${CMAKE_CURRENT_SOURCE_DIR}/../src/ps3/ps3_encryption_map.c
diff --git a/tool/ps3/convert.c b/tool/ps3/convert.c
index 52e7725..4df5dbb 100644
--- a/tool/ps3/convert.c
+++ b/tool/ps3/convert.c
@@ -29,13 +29,13 @@
 
 #include <aaruformat.h>
 
-#include "aaruformattool.h"
-#include "ird.h"
+#include "../aaruformattool.h"
 #include "iso9660_mini.h"
+#include "ird.h"
 #include "sfo.h"
 
-#include "../src/ps3/ps3_crypto.h"
-#include "../src/ps3/ps3_encryption_map.h"
+#include "../../src/ps3/ps3_crypto.h"
+#include "../../src/ps3/ps3_encryption_map.h"
 
 /* ANSI color codes */
 #define ANSI_RESET  "\033[0m"
diff --git a/tool/wiiu/convert.c b/tool/wiiu/convert.c
index c838642..448b948 100644
--- a/tool/wiiu/convert.c
+++ b/tool/wiiu/convert.c
@@ -30,11 +30,11 @@
 
 #include <aaruformat.h>
 
-#include "aaruformattool.h"
-#include "wiiu_reader.h"
+#include "../aaruformattool.h"
+#include "reader.h"
 
-#include "../src/lib/aes128.h"
-#include "../src/wiiu/wiiu_crypto.h"
+#include "../../src/lib/aes128.h"
+#include "../../src/wiiu/wiiu_crypto.h"
 
 /* ANSI color codes */
 #define ANSI_RESET  "\033[0m"
diff --git a/tool/wiiu/reader.c b/tool/wiiu/reader.c
index 10a4d84..111b538 100644
--- a/tool/wiiu/reader.c
+++ b/tool/wiiu/reader.c
@@ -18,7 +18,7 @@
  * WUD/WUX disc reader abstraction for aaruformattool.
  */
 
-#include "wiiu_reader.h"
+#include "reader.h"
 
 #include <stdio.h>
 #include <stdlib.h>