diff --git a/Analyser/Static/FAT12/StaticAnalyser.cpp b/Analyser/Static/FAT12/StaticAnalyser.cpp
index 9c6352cae..e97f143f1 100644
--- a/Analyser/Static/FAT12/StaticAnalyser.cpp
+++ b/Analyser/Static/FAT12/StaticAnalyser.cpp
@@ -8,12 +8,12 @@
 
 #include "StaticAnalyser.hpp"
 
-#include "../Enterprise/StaticAnalyser.hpp"
-#include "../PCCompatible/StaticAnalyser.hpp"
+#include "Analyser/Static/Enterprise/StaticAnalyser.hpp"
+#include "Analyser/Static/PCCompatible/StaticAnalyser.hpp"
 
-#include "../../../Storage/Disk/Track/TrackSerialiser.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/Constants.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/SegmentParser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/SegmentParser.hpp"
 
 
 Analyser::Static::TargetList Analyser::Static::FAT12::GetTargets(
diff --git a/Analyser/Static/MSX/Cartridge.hpp b/Analyser/Static/MSX/Cartridge.hpp
index 92c1264fe..017ad5c31 100644
--- a/Analyser/Static/MSX/Cartridge.hpp
+++ b/Analyser/Static/MSX/Cartridge.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage/Cartridge/Cartridge.hpp"
+#include "Storage/Cartridge/Cartridge.hpp"
 
 namespace Analyser::Static::MSX {
 
diff --git a/Analyser/Static/MSX/StaticAnalyser.cpp b/Analyser/Static/MSX/StaticAnalyser.cpp
index 922752d04..864953651 100644
--- a/Analyser/Static/MSX/StaticAnalyser.cpp
+++ b/Analyser/Static/MSX/StaticAnalyser.cpp
@@ -12,8 +12,8 @@
 #include "Tape.hpp"
 #include "Target.hpp"
 
-#include "../Disassembler/Z80.hpp"
-#include "../Disassembler/AddressMapper.hpp"
+#include "Analyser/Static/Disassembler/Z80.hpp"
+#include "Analyser/Static//Disassembler/AddressMapper.hpp"
 
 #include <algorithm>
 
diff --git a/Analyser/Static/MSX/StaticAnalyser.hpp b/Analyser/Static/MSX/StaticAnalyser.hpp
index 709346590..5cd5093f8 100644
--- a/Analyser/Static/MSX/StaticAnalyser.hpp
+++ b/Analyser/Static/MSX/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::MSX {
diff --git a/Analyser/Static/MSX/Tape.cpp b/Analyser/Static/MSX/Tape.cpp
index 7af73ae29..6e0aaf7de 100644
--- a/Analyser/Static/MSX/Tape.cpp
+++ b/Analyser/Static/MSX/Tape.cpp
@@ -8,7 +8,7 @@
 
 #include "Tape.hpp"
 
-#include "../../../Storage/Tape/Parsers/MSX.hpp"
+#include "Storage/Tape/Parsers/MSX.hpp"
 
 using namespace Analyser::Static::MSX;
 
diff --git a/Analyser/Static/MSX/Tape.hpp b/Analyser/Static/MSX/Tape.hpp
index abcae17f1..29e51871f 100644
--- a/Analyser/Static/MSX/Tape.hpp
+++ b/Analyser/Static/MSX/Tape.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Tape.hpp"
 
 #include <string>
 #include <vector>
diff --git a/Analyser/Static/MSX/Target.hpp b/Analyser/Static/MSX/Target.hpp
index 3f57dcda0..4a45cde2d 100644
--- a/Analyser/Static/MSX/Target.hpp
+++ b/Analyser/Static/MSX/Target.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 #include <string>
 
 namespace Analyser::Static::MSX {
diff --git a/Analyser/Static/Macintosh/StaticAnalyser.hpp b/Analyser/Static/Macintosh/StaticAnalyser.hpp
index 187ab6c97..2c473ab94 100644
--- a/Analyser/Static/Macintosh/StaticAnalyser.hpp
+++ b/Analyser/Static/Macintosh/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::Macintosh {
diff --git a/Analyser/Static/Macintosh/Target.hpp b/Analyser/Static/Macintosh/Target.hpp
index ba56a6186..cfd487b1d 100644
--- a/Analyser/Static/Macintosh/Target.hpp
+++ b/Analyser/Static/Macintosh/Target.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 
 namespace Analyser::Static::Macintosh {
 
diff --git a/Analyser/Static/Oric/StaticAnalyser.cpp b/Analyser/Static/Oric/StaticAnalyser.cpp
index ef1899f52..84c0d1993 100644
--- a/Analyser/Static/Oric/StaticAnalyser.cpp
+++ b/Analyser/Static/Oric/StaticAnalyser.cpp
@@ -11,10 +11,10 @@
 #include "Tape.hpp"
 #include "Target.hpp"
 
-#include "../Disassembler/6502.hpp"
-#include "../Disassembler/AddressMapper.hpp"
+#include "Analyser/Static/Disassembler/6502.hpp"
+#include "Analyser/Static/Disassembler/AddressMapper.hpp"
 
-#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
 
 #include <cstring>
 
diff --git a/Analyser/Static/Oric/StaticAnalyser.hpp b/Analyser/Static/Oric/StaticAnalyser.hpp
index 19b4908d5..c5881281b 100644
--- a/Analyser/Static/Oric/StaticAnalyser.hpp
+++ b/Analyser/Static/Oric/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::Oric {
diff --git a/Analyser/Static/Oric/Tape.cpp b/Analyser/Static/Oric/Tape.cpp
index e29ee06cd..ee6ef62d1 100644
--- a/Analyser/Static/Oric/Tape.cpp
+++ b/Analyser/Static/Oric/Tape.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "Tape.hpp"
-#include "../../../Storage/Tape/Parsers/Oric.hpp"
+#include "Storage/Tape/Parsers/Oric.hpp"
 
 using namespace Analyser::Static::Oric;
 
diff --git a/Analyser/Static/Oric/Tape.hpp b/Analyser/Static/Oric/Tape.hpp
index 2508571b5..4fd7eb0c4 100644
--- a/Analyser/Static/Oric/Tape.hpp
+++ b/Analyser/Static/Oric/Tape.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Tape.hpp"
 
 #include <string>
 #include <vector>
diff --git a/Analyser/Static/Oric/Target.hpp b/Analyser/Static/Oric/Target.hpp
index 4871b0f71..5b40166eb 100644
--- a/Analyser/Static/Oric/Target.hpp
+++ b/Analyser/Static/Oric/Target.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 #include <string>
 
 namespace Analyser::Static::Oric {
diff --git a/Analyser/Static/PCCompatible/StaticAnalyser.hpp b/Analyser/Static/PCCompatible/StaticAnalyser.hpp
index e5416c396..51cc6b01f 100644
--- a/Analyser/Static/PCCompatible/StaticAnalyser.hpp
+++ b/Analyser/Static/PCCompatible/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::PCCompatible {
diff --git a/Analyser/Static/PCCompatible/Target.hpp b/Analyser/Static/PCCompatible/Target.hpp
index 4129d65a2..ad94736e2 100644
--- a/Analyser/Static/PCCompatible/Target.hpp
+++ b/Analyser/Static/PCCompatible/Target.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Struct.hpp"
 
 namespace Analyser::Static::PCCompatible {
 
diff --git a/Analyser/Static/Sega/StaticAnalyser.hpp b/Analyser/Static/Sega/StaticAnalyser.hpp
index 515258277..8b5164e49 100644
--- a/Analyser/Static/Sega/StaticAnalyser.hpp
+++ b/Analyser/Static/Sega/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::Sega {
diff --git a/Analyser/Static/Sega/Target.hpp b/Analyser/Static/Sega/Target.hpp
index 9eef479a5..b66f50916 100644
--- a/Analyser/Static/Sega/Target.hpp
+++ b/Analyser/Static/Sega/Target.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 
 namespace Analyser::Static::Sega {
 
diff --git a/Analyser/Static/ZX8081/StaticAnalyser.cpp b/Analyser/Static/ZX8081/StaticAnalyser.cpp
index 226fef91b..409ec51da 100644
--- a/Analyser/Static/ZX8081/StaticAnalyser.cpp
+++ b/Analyser/Static/ZX8081/StaticAnalyser.cpp
@@ -12,7 +12,7 @@
 #include <vector>
 
 #include "Target.hpp"
-#include "../../../Storage/Tape/Parsers/ZX8081.hpp"
+#include "Storage/Tape/Parsers/ZX8081.hpp"
 
 static std::vector<Storage::Data::ZX8081::File> GetFiles(Storage::Tape::TapeSerialiser &serialiser) {
 	std::vector<Storage::Data::ZX8081::File> files;
diff --git a/Analyser/Static/ZX8081/StaticAnalyser.hpp b/Analyser/Static/ZX8081/StaticAnalyser.hpp
index 2714ccad1..583d337a3 100644
--- a/Analyser/Static/ZX8081/StaticAnalyser.hpp
+++ b/Analyser/Static/ZX8081/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::ZX8081 {
diff --git a/Analyser/Static/ZX8081/Target.hpp b/Analyser/Static/ZX8081/Target.hpp
index 30adde55f..755a58be8 100644
--- a/Analyser/Static/ZX8081/Target.hpp
+++ b/Analyser/Static/ZX8081/Target.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 #include <string>
 
 namespace Analyser::Static::ZX8081 {
diff --git a/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp b/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp
index 36771307f..723886881 100644
--- a/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp
+++ b/Analyser/Static/ZXSpectrum/StaticAnalyser.cpp
@@ -8,9 +8,9 @@
 
 #include "StaticAnalyser.hpp"
 
-#include "../../../Storage/Disk/Parsers/CPM.hpp"
-#include "../../../Storage/Disk/Encodings/MFM/Parser.hpp"
-#include "../../../Storage/Tape/Parsers/Spectrum.hpp"
+#include "Storage/Disk/Parsers/CPM.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
+#include "Storage/Tape/Parsers/Spectrum.hpp"
 
 #include "Target.hpp"
 
diff --git a/Analyser/Static/ZXSpectrum/StaticAnalyser.hpp b/Analyser/Static/ZXSpectrum/StaticAnalyser.hpp
index 7351fbc55..5b718b077 100644
--- a/Analyser/Static/ZXSpectrum/StaticAnalyser.hpp
+++ b/Analyser/Static/ZXSpectrum/StaticAnalyser.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../StaticAnalyser.hpp"
-#include "../../../Storage/TargetPlatforms.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Storage/TargetPlatforms.hpp"
 #include <string>
 
 namespace Analyser::Static::ZXSpectrum {
diff --git a/Analyser/Static/ZXSpectrum/Target.hpp b/Analyser/Static/ZXSpectrum/Target.hpp
index ff07ec4d7..e62d3bddd 100644
--- a/Analyser/Static/ZXSpectrum/Target.hpp
+++ b/Analyser/Static/ZXSpectrum/Target.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
 
 namespace Analyser::Static::ZXSpectrum {
 
diff --git a/ClockReceiver/JustInTime.hpp b/ClockReceiver/JustInTime.hpp
index 209c50fc8..4c1078bed 100644
--- a/ClockReceiver/JustInTime.hpp
+++ b/ClockReceiver/JustInTime.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ClockReceiver.hpp"
-#include "../Concurrency/AsyncTaskQueue.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
 #include "ClockingHintSource.hpp"
 #include "ForceInline.hpp"
 
diff --git a/Components/1770/1770.hpp b/Components/1770/1770.hpp
index fc8f05af7..77003ec54 100644
--- a/Components/1770/1770.hpp
+++ b/Components/1770/1770.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Storage/Disk/Controller/MFMDiskController.hpp"
+#include "Storage/Disk/Controller/MFMDiskController.hpp"
 
 namespace WD {
 
diff --git a/Components/5380/ncr5380.hpp b/Components/5380/ncr5380.hpp
index 38120795b..c542b5674 100644
--- a/Components/5380/ncr5380.hpp
+++ b/Components/5380/ncr5380.hpp
@@ -8,11 +8,9 @@
 
 #pragma once
 
+#include "Storage/MassStorage/SCSI/SCSI.hpp"
 #include <cstdint>
 
-#include "../../Storage/MassStorage/SCSI/SCSI.hpp"
-
-
 namespace NCR::NCR5380 {
 
 /*!
diff --git a/Components/6522/6522.hpp b/Components/6522/6522.hpp
index 051f609ef..4d7eaee11 100644
--- a/Components/6522/6522.hpp
+++ b/Components/6522/6522.hpp
@@ -8,12 +8,10 @@
 
 #pragma once
 
+#include "Components/6522/Implementation/6522Storage.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 #include <cstdint>
 
-#include "Implementation/6522Storage.hpp"
-
-#include "../../ClockReceiver/ClockReceiver.hpp"
-
 namespace MOS::MOS6522 {
 
 enum Port {
diff --git a/Components/6522/Implementation/IRQDelegatePortHandler.cpp b/Components/6522/Implementation/IRQDelegatePortHandler.cpp
index c2648afdd..485f9830f 100644
--- a/Components/6522/Implementation/IRQDelegatePortHandler.cpp
+++ b/Components/6522/Implementation/IRQDelegatePortHandler.cpp
@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //
 
-#include "../6522.hpp"
+#include "Components/6522/6522.hpp"
 
 using namespace MOS::MOS6522;
 
diff --git a/Components/6526/6526.hpp b/Components/6526/6526.hpp
index 2ce79397c..c89b90473 100644
--- a/Components/6526/6526.hpp
+++ b/Components/6526/6526.hpp
@@ -11,7 +11,7 @@
 #include <cstdint>
 
 #include "Implementation/6526Storage.hpp"
-#include "../Serial/Line.hpp"
+#include "Components/Serial/Line.hpp"
 
 namespace MOS::MOS6526 {
 
diff --git a/Components/6532/6532.hpp b/Components/6532/6532.hpp
index f04a27b3e..7df1b6e1b 100644
--- a/Components/6532/6532.hpp
+++ b/Components/6532/6532.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
+#include "ClockReceiver/ClockReceiver.hpp"
+
 #include <cstdint>
 #include <cstdio>
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-
 namespace MOS {
 
 /*!
diff --git a/Components/6845/CRTC6845.hpp b/Components/6845/CRTC6845.hpp
index bf9fa29af..03cba87a5 100644
--- a/Components/6845/CRTC6845.hpp
+++ b/Components/6845/CRTC6845.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <cstdint>
 #include <cstdio>
diff --git a/Components/6850/6850.hpp b/Components/6850/6850.hpp
index b350f0956..153c6f852 100644
--- a/Components/6850/6850.hpp
+++ b/Components/6850/6850.hpp
@@ -9,10 +9,10 @@
 #pragma once
 
 #include <cstdint>
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ForceInline.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
-#include "../Serial/Line.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ForceInline.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "Components/Serial/Line.hpp"
 
 namespace Motorola::ACIA {
 
diff --git a/Components/68901/MFP68901.hpp b/Components/68901/MFP68901.hpp
index 635b3f806..bd17dd4b7 100644
--- a/Components/68901/MFP68901.hpp
+++ b/Components/68901/MFP68901.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
 #include <cstdint>
 
diff --git a/Components/8272/i8272.hpp b/Components/8272/i8272.hpp
index dc1ac7dd3..35989c772 100644
--- a/Components/8272/i8272.hpp
+++ b/Components/8272/i8272.hpp
@@ -11,7 +11,7 @@
 #include "CommandDecoder.hpp"
 #include "Status.hpp"
 
-#include "../../Storage/Disk/Controller/MFMDiskController.hpp"
+#include "Storage/Disk/Controller/MFMDiskController.hpp"
 
 #include <cstdint>
 #include <memory>
diff --git a/Components/9918/Implementation/ClockConverter.hpp b/Components/9918/Implementation/ClockConverter.hpp
index 3b4253583..64f6d286e 100644
--- a/Components/9918/Implementation/ClockConverter.hpp
+++ b/Components/9918/Implementation/ClockConverter.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../9918.hpp"
+#include "Components/9918/9918.hpp"
 #include "PersonalityTraits.hpp"
 #include "LineLayout.hpp"
 
diff --git a/Components/DiskII/DiskII.hpp b/Components/DiskII/DiskII.hpp
index 17851b62a..ee6e52151 100644
--- a/Components/DiskII/DiskII.hpp
+++ b/Components/DiskII/DiskII.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
-#include "../../Storage/Disk/Disk.hpp"
-#include "../../Storage/Disk/Drive.hpp"
+#include "Storage/Disk/Disk.hpp"
+#include "Storage/Disk/Drive.hpp"
 
-#include "../../Activity/Observer.hpp"
+#include "Activity/Observer.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/Components/DiskII/IWM.hpp b/Components/DiskII/IWM.hpp
index fc4427e49..146336895 100644
--- a/Components/DiskII/IWM.hpp
+++ b/Components/DiskII/IWM.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "../../Activity/Observer.hpp"
+#include "Activity/Observer.hpp"
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
-#include "../../Storage/Disk/Drive.hpp"
+#include "Storage/Disk/Drive.hpp"
 
 #include <cstdint>
 
diff --git a/Components/OPx/Implementation/LowFrequencyOscillator.hpp b/Components/OPx/Implementation/LowFrequencyOscillator.hpp
index 66e017b9b..f3d6a6910 100644
--- a/Components/OPx/Implementation/LowFrequencyOscillator.hpp
+++ b/Components/OPx/Implementation/LowFrequencyOscillator.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Numeric/LFSR.hpp"
+#include "Numeric/LFSR.hpp"
 
 namespace Yamaha::OPL {
 
diff --git a/Components/RP5C01/RP5C01.cpp b/Components/RP5C01/RP5C01.cpp
index 562fca6c1..fc323632d 100644
--- a/Components/RP5C01/RP5C01.cpp
+++ b/Components/RP5C01/RP5C01.cpp
@@ -8,7 +8,7 @@
 
 #include "RP5C01.hpp"
 
-#include "../../Numeric/NumericCoder.hpp"
+#include "Numeric/NumericCoder.hpp"
 
 #include <ctime>
 
diff --git a/Components/RP5C01/RP5C01.hpp b/Components/RP5C01/RP5C01.hpp
index 8df2fca12..ebb791652 100644
--- a/Components/RP5C01/RP5C01.hpp
+++ b/Components/RP5C01/RP5C01.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/Components/Serial/Line.hpp b/Components/Serial/Line.hpp
index 989442cb8..5d20fb956 100644
--- a/Components/Serial/Line.hpp
+++ b/Components/Serial/Line.hpp
@@ -9,9 +9,9 @@
 #pragma once
 
 #include <vector>
-#include "../../Storage/Storage.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ForceInline.hpp"
+#include "Storage/Storage.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ForceInline.hpp"
 
 namespace Serial {
 
diff --git a/Concurrency/AsyncTaskQueue.hpp b/Concurrency/AsyncTaskQueue.hpp
index 00cdddaa9..6135877b7 100644
--- a/Concurrency/AsyncTaskQueue.hpp
+++ b/Concurrency/AsyncTaskQueue.hpp
@@ -14,7 +14,7 @@
 #include <thread>
 #include <vector>
 
-#include "../ClockReceiver/TimeTypes.hpp"
+#include "ClockReceiver/TimeTypes.hpp"
 
 namespace Concurrency {
 
diff --git a/Configurable/Configurable.hpp b/Configurable/Configurable.hpp
index 0144d34c3..58bbfb319 100644
--- a/Configurable/Configurable.hpp
+++ b/Configurable/Configurable.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Reflection/Struct.hpp"
+#include "Reflection/Struct.hpp"
 
 #include <memory>
 
diff --git a/Configurable/StandardOptions.hpp b/Configurable/StandardOptions.hpp
index c57513718..69bea0622 100644
--- a/Configurable/StandardOptions.hpp
+++ b/Configurable/StandardOptions.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Reflection/Enum.hpp"
+#include "Reflection/Enum.hpp"
 
 namespace Configurable {
 
diff --git a/Inputs/QuadratureMouse/QuadratureMouse.hpp b/Inputs/QuadratureMouse/QuadratureMouse.hpp
index ce2edf883..44cced006 100644
--- a/Inputs/QuadratureMouse/QuadratureMouse.hpp
+++ b/Inputs/QuadratureMouse/QuadratureMouse.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Mouse.hpp"
+#include "Inputs/Mouse.hpp"
 #include <atomic>
 
 namespace Inputs {
diff --git a/InstructionSets/ARM/Executor.hpp b/InstructionSets/ARM/Executor.hpp
index 9371429d4..21d67e87d 100644
--- a/InstructionSets/ARM/Executor.hpp
+++ b/InstructionSets/ARM/Executor.hpp
@@ -11,7 +11,7 @@
 #include "BarrelShifter.hpp"
 #include "OperationMapper.hpp"
 #include "Registers.hpp"
-#include "../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 namespace InstructionSet::ARM {
 
diff --git a/InstructionSets/ARM/OperationMapper.hpp b/InstructionSets/ARM/OperationMapper.hpp
index 17a98ea99..b899c5fcb 100644
--- a/InstructionSets/ARM/OperationMapper.hpp
+++ b/InstructionSets/ARM/OperationMapper.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Reflection/Dispatcher.hpp"
+#include "Reflection/Dispatcher.hpp"
 #include "BarrelShifter.hpp"
 
 namespace InstructionSet::ARM {
diff --git a/InstructionSets/CachingExecutor.hpp b/InstructionSets/CachingExecutor.hpp
index 16b7753cf..7841e2335 100644
--- a/InstructionSets/CachingExecutor.hpp
+++ b/InstructionSets/CachingExecutor.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Numeric/Sizes.hpp"
+#include "Numeric/Sizes.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/InstructionSets/Disassembler.hpp b/InstructionSets/Disassembler.hpp
index acd295e15..0e2bc89aa 100644
--- a/InstructionSets/Disassembler.hpp
+++ b/InstructionSets/Disassembler.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Numeric/Sizes.hpp"
+#include "Numeric/Sizes.hpp"
 
 #include <list>
 #include <map>
diff --git a/InstructionSets/M50740/Executor.hpp b/InstructionSets/M50740/Executor.hpp
index bd9f8f7c4..c25290b30 100644
--- a/InstructionSets/M50740/Executor.hpp
+++ b/InstructionSets/M50740/Executor.hpp
@@ -10,8 +10,8 @@
 
 #include "Instruction.hpp"
 #include "Parser.hpp"
-#include "../CachingExecutor.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "InstructionSets/CachingExecutor.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/InstructionSets/M50740/Instruction.hpp b/InstructionSets/M50740/Instruction.hpp
index 5bfbe82e6..511bc0b57 100644
--- a/InstructionSets/M50740/Instruction.hpp
+++ b/InstructionSets/M50740/Instruction.hpp
@@ -12,7 +12,7 @@
 #include <iomanip>
 #include <string>
 #include <sstream>
-#include "../AccessType.hpp"
+#include "InstructionSets/AccessType.hpp"
 
 namespace InstructionSet::M50740 {
 
diff --git a/InstructionSets/M50740/Parser.hpp b/InstructionSets/M50740/Parser.hpp
index d1955a52f..54070998f 100644
--- a/InstructionSets/M50740/Parser.hpp
+++ b/InstructionSets/M50740/Parser.hpp
@@ -10,7 +10,7 @@
 
 #include <cstdint>
 #include "Decoder.hpp"
-#include "../AccessType.hpp"
+#include "InstructionSets/AccessType.hpp"
 
 namespace InstructionSet::M50740 {
 
diff --git a/InstructionSets/M68k/Decoder.hpp b/InstructionSets/M68k/Decoder.hpp
index ce2b0dc54..3c7266b0b 100644
--- a/InstructionSets/M68k/Decoder.hpp
+++ b/InstructionSets/M68k/Decoder.hpp
@@ -10,7 +10,7 @@
 
 #include "Instruction.hpp"
 #include "Model.hpp"
-#include "../../Numeric/Sizes.hpp"
+#include "Numeric/Sizes.hpp"
 
 namespace InstructionSet::M68k {
 
diff --git a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
index 4ca9dd2e5..46e44485e 100644
--- a/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
+++ b/InstructionSets/M68k/Implementation/ExecutorImplementation.hpp
@@ -9,8 +9,8 @@
 
 #pragma once
 
-#include "../Perform.hpp"
-#include "../ExceptionVectors.hpp"
+#include "InstructionSets/M68k/Perform.hpp"
+#include "InstructionSets/M68k/ExceptionVectors.hpp"
 
 #include <cassert>
 
diff --git a/InstructionSets/M68k/Implementation/PerformImplementation.hpp b/InstructionSets/M68k/Implementation/PerformImplementation.hpp
index 2ec702b0e..c2e53a4b5 100644
--- a/InstructionSets/M68k/Implementation/PerformImplementation.hpp
+++ b/InstructionSets/M68k/Implementation/PerformImplementation.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../../Numeric/Carry.hpp"
-#include "../ExceptionVectors.hpp"
+#include "Numeric/Carry.hpp"
+#include "InstructionSets/M68k/ExceptionVectors.hpp"
 
 #include <algorithm>
 #include <cassert>
diff --git a/InstructionSets/M68k/Perform.hpp b/InstructionSets/M68k/Perform.hpp
index 98594aaa6..e5f33d51e 100644
--- a/InstructionSets/M68k/Perform.hpp
+++ b/InstructionSets/M68k/Perform.hpp
@@ -11,7 +11,7 @@
 #include "Model.hpp"
 #include "Instruction.hpp"
 #include "Status.hpp"
-#include "../../Numeric/RegisterSizes.hpp"
+#include "Numeric/RegisterSizes.hpp"
 
 namespace InstructionSet::M68k {
 
diff --git a/InstructionSets/x86/Flags.hpp b/InstructionSets/x86/Flags.hpp
index 3041b0215..a4ba1d6ac 100644
--- a/InstructionSets/x86/Flags.hpp
+++ b/InstructionSets/x86/Flags.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 namespace InstructionSet::x86 {
 
diff --git a/InstructionSets/x86/Implementation/Arithmetic.hpp b/InstructionSets/x86/Implementation/Arithmetic.hpp
index ac7cafaa0..ecc605b3d 100644
--- a/InstructionSets/x86/Implementation/Arithmetic.hpp
+++ b/InstructionSets/x86/Implementation/Arithmetic.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
-#include "../Interrupts.hpp"
-#include "../Perform.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
+#include "InstructionSets/x86/Interrupts.hpp"
+#include "InstructionSets/x86/Perform.hpp"
 
-#include "../../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 namespace InstructionSet::x86::Primitive {
 
diff --git a/InstructionSets/x86/Implementation/BCD.hpp b/InstructionSets/x86/Implementation/BCD.hpp
index a9cdc1876..af1e34904 100644
--- a/InstructionSets/x86/Implementation/BCD.hpp
+++ b/InstructionSets/x86/Implementation/BCD.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
-#include "../../../Numeric/RegisterSizes.hpp"
+#include "Numeric/RegisterSizes.hpp"
 
 namespace InstructionSet::x86::Primitive {
 
diff --git a/InstructionSets/x86/Implementation/FlowControl.hpp b/InstructionSets/x86/Implementation/FlowControl.hpp
index 2a13eaede..667ab9f4d 100644
--- a/InstructionSets/x86/Implementation/FlowControl.hpp
+++ b/InstructionSets/x86/Implementation/FlowControl.hpp
@@ -10,7 +10,7 @@
 
 #include "Resolver.hpp"
 #include "Stack.hpp"
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <type_traits>
 
diff --git a/InstructionSets/x86/Implementation/InOut.hpp b/InstructionSets/x86/Implementation/InOut.hpp
index 98486d4ec..52946c625 100644
--- a/InstructionSets/x86/Implementation/InOut.hpp
+++ b/InstructionSets/x86/Implementation/InOut.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 
diff --git a/InstructionSets/x86/Implementation/LoadStore.hpp b/InstructionSets/x86/Implementation/LoadStore.hpp
index e03c1e4ea..e8bfe8a13 100644
--- a/InstructionSets/x86/Implementation/LoadStore.hpp
+++ b/InstructionSets/x86/Implementation/LoadStore.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <utility>
 
diff --git a/InstructionSets/x86/Implementation/Logical.hpp b/InstructionSets/x86/Implementation/Logical.hpp
index d27f63d39..216a445ab 100644
--- a/InstructionSets/x86/Implementation/Logical.hpp
+++ b/InstructionSets/x86/Implementation/Logical.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 
diff --git a/InstructionSets/x86/Implementation/PerformImplementation.hpp b/InstructionSets/x86/Implementation/PerformImplementation.hpp
index 8a1e7a6f7..4ea1988db 100644
--- a/InstructionSets/x86/Implementation/PerformImplementation.hpp
+++ b/InstructionSets/x86/Implementation/PerformImplementation.hpp
@@ -20,8 +20,8 @@
 #include "ShiftRoll.hpp"
 #include "Stack.hpp"
 
-#include "../Interrupts.hpp"
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/Interrupts.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 //
 // Comments throughout headers above come from the 1997 edition of the
diff --git a/InstructionSets/x86/Implementation/Repetition.hpp b/InstructionSets/x86/Implementation/Repetition.hpp
index 01e6c1d48..00ec6236b 100644
--- a/InstructionSets/x86/Implementation/Repetition.hpp
+++ b/InstructionSets/x86/Implementation/Repetition.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 
diff --git a/InstructionSets/x86/Implementation/Resolver.hpp b/InstructionSets/x86/Implementation/Resolver.hpp
index 28373a129..f995531b6 100644
--- a/InstructionSets/x86/Implementation/Resolver.hpp
+++ b/InstructionSets/x86/Implementation/Resolver.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86 {
 
diff --git a/InstructionSets/x86/Implementation/ShiftRoll.hpp b/InstructionSets/x86/Implementation/ShiftRoll.hpp
index d17b572f7..3181309cf 100644
--- a/InstructionSets/x86/Implementation/ShiftRoll.hpp
+++ b/InstructionSets/x86/Implementation/ShiftRoll.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 namespace InstructionSet::x86::Primitive {
 
diff --git a/InstructionSets/x86/Implementation/Stack.hpp b/InstructionSets/x86/Implementation/Stack.hpp
index 5f538dcd0..54b0a0a9f 100644
--- a/InstructionSets/x86/Implementation/Stack.hpp
+++ b/InstructionSets/x86/Implementation/Stack.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <type_traits>
 
diff --git a/InstructionSets/x86/Instruction.cpp b/InstructionSets/x86/Instruction.cpp
index afb7e2d77..5632fc504 100644
--- a/InstructionSets/x86/Instruction.cpp
+++ b/InstructionSets/x86/Instruction.cpp
@@ -8,7 +8,7 @@
 
 #include "Instruction.hpp"
 
-#include "../../Numeric/Carry.hpp"
+#include "Numeric/Carry.hpp"
 
 #include <cassert>
 #include <iomanip>
diff --git a/Machines/Acorn/Archimedes/Archimedes.hpp b/Machines/Acorn/Archimedes/Archimedes.hpp
index e2ee5d8f1..f684fe37a 100644
--- a/Machines/Acorn/Archimedes/Archimedes.hpp
+++ b/Machines/Acorn/Archimedes/Archimedes.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Acorn/Archimedes/FloppyDisc.hpp b/Machines/Acorn/Archimedes/FloppyDisc.hpp
index a60097f2c..ec3e2e852 100644
--- a/Machines/Acorn/Archimedes/FloppyDisc.hpp
+++ b/Machines/Acorn/Archimedes/FloppyDisc.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Components/1770/1770.hpp"
+#include "Components/1770/1770.hpp"
 
 namespace Archimedes {
 
diff --git a/Machines/Acorn/Archimedes/KeyboardMapper.hpp b/Machines/Acorn/Archimedes/KeyboardMapper.hpp
index 2bec57838..0a29d1178 100644
--- a/Machines/Acorn/Archimedes/KeyboardMapper.hpp
+++ b/Machines/Acorn/Archimedes/KeyboardMapper.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
+#include "Machines/KeyboardMachine.hpp"
 #include "Keyboard.hpp"
 
 namespace Archimedes {
diff --git a/Machines/Acorn/Electron/Electron.hpp b/Machines/Acorn/Electron/Electron.hpp
index 04142d90b..aec0ae858 100644
--- a/Machines/Acorn/Electron/Electron.hpp
+++ b/Machines/Acorn/Electron/Electron.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Acorn/Electron/Keyboard.hpp b/Machines/Acorn/Electron/Keyboard.hpp
index 61d425a1e..fcb25d042 100644
--- a/Machines/Acorn/Electron/Keyboard.hpp
+++ b/Machines/Acorn/Electron/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Electron {
 
diff --git a/Machines/Acorn/Electron/Plus3.hpp b/Machines/Acorn/Electron/Plus3.hpp
index c76dfa4bf..948f89d1d 100644
--- a/Machines/Acorn/Electron/Plus3.hpp
+++ b/Machines/Acorn/Electron/Plus3.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../../Components/1770/1770.hpp"
-#include "../../../Activity/Observer.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Observer.hpp"
 
 namespace Electron {
 
diff --git a/Machines/Acorn/Electron/Tape.hpp b/Machines/Acorn/Electron/Tape.hpp
index 548dde30d..2fe5e5378 100644
--- a/Machines/Acorn/Electron/Tape.hpp
+++ b/Machines/Acorn/Electron/Tape.hpp
@@ -10,9 +10,9 @@
 
 #include <cstdint>
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Storage/Tape/Tape.hpp"
-#include "../../../Storage/Tape/Parsers/Acorn.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Storage/Tape/Tape.hpp"
+#include "Storage/Tape/Parsers/Acorn.hpp"
 #include "Interrupts.hpp"
 
 namespace Electron {
diff --git a/Machines/Amiga/Amiga.hpp b/Machines/Amiga/Amiga.hpp
index 8379d99dc..892228883 100644
--- a/Machines/Amiga/Amiga.hpp
+++ b/Machines/Amiga/Amiga.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Amiga/Blitter.hpp b/Machines/Amiga/Blitter.hpp
index 3cf28afda..dfb3267ad 100644
--- a/Machines/Amiga/Blitter.hpp
+++ b/Machines/Amiga/Blitter.hpp
@@ -13,7 +13,7 @@
 #include <string>
 #include <vector>
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 #include "BlitterSequencer.hpp"
 #include "DMADevice.hpp"
 
diff --git a/Machines/Amiga/Keyboard.hpp b/Machines/Amiga/Keyboard.hpp
index e8a968875..451b0854d 100644
--- a/Machines/Amiga/Keyboard.hpp
+++ b/Machines/Amiga/Keyboard.hpp
@@ -8,11 +8,12 @@
 
 #pragma once
 
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Components/Serial/Line.hpp"
+#include "Machines/KeyboardMachine.hpp"
+
 #include <array>
 #include <cstdint>
-#include "../KeyboardMachine.hpp"
-#include "../../Components/Serial/Line.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
 
 namespace Amiga {
 
diff --git a/Machines/Amiga/MemoryMap.hpp b/Machines/Amiga/MemoryMap.hpp
index a82069350..e7b0d9e56 100644
--- a/Machines/Amiga/MemoryMap.hpp
+++ b/Machines/Amiga/MemoryMap.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Analyser/Static/Amiga/Target.hpp"
+#include "Analyser/Static/Amiga/Target.hpp"
 
 #include <array>
 #include <cassert>
diff --git a/Machines/Amiga/MouseJoystick.hpp b/Machines/Amiga/MouseJoystick.hpp
index 50da9d59a..8a576b231 100644
--- a/Machines/Amiga/MouseJoystick.hpp
+++ b/Machines/Amiga/MouseJoystick.hpp
@@ -11,8 +11,8 @@
 #include <array>
 #include <atomic>
 
-#include "../../Inputs/Joystick.hpp"
-#include "../../Inputs/Mouse.hpp"
+#include "Inputs/Joystick.hpp"
+#include "Inputs/Mouse.hpp"
 
 namespace Amiga {
 
diff --git a/Machines/AmstradCPC/AmstradCPC.hpp b/Machines/AmstradCPC/AmstradCPC.hpp
index a595959a4..4d163ee87 100644
--- a/Machines/AmstradCPC/AmstradCPC.hpp
+++ b/Machines/AmstradCPC/AmstradCPC.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/AmstradCPC/FDC.hpp b/Machines/AmstradCPC/FDC.hpp
index 41c11f0f9..877e2a296 100644
--- a/Machines/AmstradCPC/FDC.hpp
+++ b/Machines/AmstradCPC/FDC.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Components/8272/i8272.hpp"
+#include "Components/8272/i8272.hpp"
 
 namespace Amstrad {
 
diff --git a/Machines/AmstradCPC/Keyboard.hpp b/Machines/AmstradCPC/Keyboard.hpp
index 864f5e933..799b25cb2 100644
--- a/Machines/AmstradCPC/Keyboard.hpp
+++ b/Machines/AmstradCPC/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../KeyboardMachine.hpp"
-#include "../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace AmstradCPC {
 
diff --git a/Machines/Apple/ADB/Bus.hpp b/Machines/Apple/ADB/Bus.hpp
index 46be3a3f5..923ac916a 100644
--- a/Machines/Apple/ADB/Bus.hpp
+++ b/Machines/Apple/ADB/Bus.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <bitset>
 #include <cstddef>
diff --git a/Machines/Apple/ADB/Keyboard.hpp b/Machines/Apple/ADB/Keyboard.hpp
index ba1b4e284..6f3c4df58 100644
--- a/Machines/Apple/ADB/Keyboard.hpp
+++ b/Machines/Apple/ADB/Keyboard.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "ReactiveDevice.hpp"
-#include "../../../Inputs/Keyboard.hpp"
-#include "../../KeyboardMachine.hpp"
+#include "Inputs/Keyboard.hpp"
+#include "Machines/KeyboardMachine.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/Machines/Apple/ADB/Mouse.hpp b/Machines/Apple/ADB/Mouse.hpp
index 06b2a1314..d7204b153 100644
--- a/Machines/Apple/ADB/Mouse.hpp
+++ b/Machines/Apple/ADB/Mouse.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "ReactiveDevice.hpp"
-#include "../../../Inputs/Mouse.hpp"
+#include "Inputs/Mouse.hpp"
 
 namespace Apple::ADB {
 
diff --git a/Machines/Apple/AppleII/AppleII.hpp b/Machines/Apple/AppleII/AppleII.hpp
index 09056cdeb..619865778 100644
--- a/Machines/Apple/AppleII/AppleII.hpp
+++ b/Machines/Apple/AppleII/AppleII.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Apple/AppleII/Card.hpp b/Machines/Apple/AppleII/Card.hpp
index b7e525bdc..093e3a70f 100644
--- a/Machines/Apple/AppleII/Card.hpp
+++ b/Machines/Apple/AppleII/Card.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Processors/6502/6502.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Activity/Observer.hpp"
+#include "Processors/6502/6502.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Activity/Observer.hpp"
 
 namespace Apple::II {
 
diff --git a/Machines/Apple/AppleII/DiskIICard.hpp b/Machines/Apple/AppleII/DiskIICard.hpp
index be4bbfbad..0128d6f9d 100644
--- a/Machines/Apple/AppleII/DiskIICard.hpp
+++ b/Machines/Apple/AppleII/DiskIICard.hpp
@@ -9,11 +9,11 @@
 #pragma once
 
 #include "Card.hpp"
-#include "../../ROMMachine.hpp"
+#include "Machines/ROMMachine.hpp"
 
-#include "../../../Components/DiskII/DiskII.hpp"
-#include "../../../Storage/Disk/Disk.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
+#include "Components/DiskII/DiskII.hpp"
+#include "Storage/Disk/Disk.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
 #include <cstdint>
 #include <memory>
diff --git a/Machines/Apple/AppleII/Joystick.hpp b/Machines/Apple/AppleII/Joystick.hpp
index 4a53fde1e..f34881e85 100644
--- a/Machines/Apple/AppleII/Joystick.hpp
+++ b/Machines/Apple/AppleII/Joystick.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Inputs/Joystick.hpp"
+#include "Inputs/Joystick.hpp"
 
 #include <memory>
 #include <vector>
diff --git a/Machines/Apple/AppleII/Mockingboard.hpp b/Machines/Apple/AppleII/Mockingboard.hpp
index 402ee24cb..ee2792c3f 100644
--- a/Machines/Apple/AppleII/Mockingboard.hpp
+++ b/Machines/Apple/AppleII/Mockingboard.hpp
@@ -10,7 +10,7 @@
 
 #include "Card.hpp"
 
-#include "../../../Components/6522/6522.hpp"
+#include "Components/6522/6522.hpp"
 
 namespace Apple::II {
 
diff --git a/Machines/Apple/AppleII/VideoSwitches.hpp b/Machines/Apple/AppleII/VideoSwitches.hpp
index 98fd69fa6..e0ba14a98 100644
--- a/Machines/Apple/AppleII/VideoSwitches.hpp
+++ b/Machines/Apple/AppleII/VideoSwitches.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../ClockReceiver/DeferredQueue.hpp"
-#include "../../ROMMachine.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/DeferredQueue.hpp"
+#include "Machines/ROMMachine.hpp"
 
 namespace Apple::II {
 
diff --git a/Machines/Apple/AppleIIgs/ADB.hpp b/Machines/Apple/AppleIIgs/ADB.hpp
index 125687789..0a90870a0 100644
--- a/Machines/Apple/AppleIIgs/ADB.hpp
+++ b/Machines/Apple/AppleIIgs/ADB.hpp
@@ -10,11 +10,11 @@
 
 #include <cstdint>
 #include <vector>
-#include "../../../InstructionSets/M50740/Executor.hpp"
+#include "InstructionSets/M50740/Executor.hpp"
 
-#include "../ADB/Bus.hpp"
-#include "../ADB/Mouse.hpp"
-#include "../ADB/Keyboard.hpp"
+#include "Machines/Apple/ADB/Bus.hpp"
+#include "Machines/Apple/ADB/Mouse.hpp"
+#include "Machines/Apple/ADB/Keyboard.hpp"
 
 namespace Apple::IIgs::ADB {
 
diff --git a/Machines/Apple/AppleIIgs/AppleIIgs.hpp b/Machines/Apple/AppleIIgs/AppleIIgs.hpp
index 261d35525..12224f629 100644
--- a/Machines/Apple/AppleIIgs/AppleIIgs.hpp
+++ b/Machines/Apple/AppleIIgs/AppleIIgs.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Apple/AppleIIgs/MemoryMap.hpp b/Machines/Apple/AppleIIgs/MemoryMap.hpp
index 94fef9c05..a6678a79f 100644
--- a/Machines/Apple/AppleIIgs/MemoryMap.hpp
+++ b/Machines/Apple/AppleIIgs/MemoryMap.hpp
@@ -14,8 +14,8 @@
 #include <cstdint>
 #include <vector>
 
-#include "../AppleII/LanguageCardSwitches.hpp"
-#include "../AppleII/AuxiliaryMemorySwitches.hpp"
+#include "Machines/Apple/AppleII/LanguageCardSwitches.hpp"
+#include "Machines/Apple/AppleII/AuxiliaryMemorySwitches.hpp"
 
 namespace Apple::IIgs {
 
diff --git a/Machines/Apple/Macintosh/Keyboard.hpp b/Machines/Apple/Macintosh/Keyboard.hpp
index a5a74ea10..0f13c46d2 100644
--- a/Machines/Apple/Macintosh/Keyboard.hpp
+++ b/Machines/Apple/Macintosh/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <mutex>
 #include <vector>
diff --git a/Machines/Apple/Macintosh/Macintosh.hpp b/Machines/Apple/Macintosh/Macintosh.hpp
index b60a80292..7d2d51ab2 100644
--- a/Machines/Apple/Macintosh/Macintosh.hpp
+++ b/Machines/Apple/Macintosh/Macintosh.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 namespace Apple::Macintosh {
 
diff --git a/Machines/Atari/2600/Atari2600.cpp b/Machines/Atari/2600/Atari2600.cpp
index bd2dcc51c..ccd642d13 100644
--- a/Machines/Atari/2600/Atari2600.cpp
+++ b/Machines/Atari/2600/Atari2600.cpp
@@ -11,9 +11,9 @@
 #include <algorithm>
 #include <cstdio>
 
-#include "../../MachineTypes.hpp"
+#include "Machines/MachineTypes.hpp"
 
-#include "../../../Analyser/Static/Atari2600/Target.hpp"
+#include "Analyser/Static/Atari2600/Target.hpp"
 
 #include "Cartridges/Atari8k.hpp"
 #include "Cartridges/Atari16k.hpp"
diff --git a/Machines/Atari/2600/Atari2600.hpp b/Machines/Atari/2600/Atari2600.hpp
index bec1cfec5..765ad455f 100644
--- a/Machines/Atari/2600/Atari2600.hpp
+++ b/Machines/Atari/2600/Atari2600.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include "Atari2600Inputs.h"
 
diff --git a/Machines/Atari/2600/Cartridges/Cartridge.hpp b/Machines/Atari/2600/Cartridges/Cartridge.hpp
index 25060a3cc..994c10cd9 100644
--- a/Machines/Atari/2600/Cartridges/Cartridge.hpp
+++ b/Machines/Atari/2600/Cartridges/Cartridge.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../../../Processors/6502/6502.hpp"
-#include "../Bus.hpp"
+#include "Processors/6502/6502.hpp"
+#include "Machines/Atari/2600/Bus.hpp"
 
 namespace Atari2600::Cartridge {
 
diff --git a/Machines/Atari/2600/PIA.hpp b/Machines/Atari/2600/PIA.hpp
index 1a3832d04..523c00103 100644
--- a/Machines/Atari/2600/PIA.hpp
+++ b/Machines/Atari/2600/PIA.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include <cstdint>
+#include "Components/6532/6532.hpp"
 
-#include "../../../Components/6532/6532.hpp"
+#include <cstdint>
 
 namespace Atari2600 {
 
diff --git a/Machines/Atari/ST/AtariST.hpp b/Machines/Atari/ST/AtariST.hpp
index 15970e936..4a71d1926 100644
--- a/Machines/Atari/ST/AtariST.hpp
+++ b/Machines/Atari/ST/AtariST.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Atari/ST/DMAController.hpp b/Machines/Atari/ST/DMAController.hpp
index 5501d89ea..7d7fedfdb 100644
--- a/Machines/Atari/ST/DMAController.hpp
+++ b/Machines/Atari/ST/DMAController.hpp
@@ -8,14 +8,14 @@
 
 #pragma once
 
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Source.hpp"
+
 #include <cstdint>
 #include <vector>
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
-#include "../../../Components/1770/1770.hpp"
-#include "../../../Activity/Source.hpp"
-
 namespace Atari::ST {
 
 class DMAController: public WD::WD1770::Delegate, public ClockingHint::Source, public ClockingHint::Observer {
diff --git a/Machines/Atari/ST/IntelligentKeyboard.hpp b/Machines/Atari/ST/IntelligentKeyboard.hpp
index 64ca0b18e..f594baaee 100644
--- a/Machines/Atari/ST/IntelligentKeyboard.hpp
+++ b/Machines/Atari/ST/IntelligentKeyboard.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
-#include "../../../Components/Serial/Line.hpp"
-#include "../../KeyboardMachine.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "Components/Serial/Line.hpp"
+#include "Machines/KeyboardMachine.hpp"
 
-#include "../../../Inputs/Joystick.hpp"
-#include "../../../Inputs/Mouse.hpp"
+#include "Inputs/Joystick.hpp"
+#include "Inputs/Mouse.hpp"
 
 #include <atomic>
 #include <mutex>
diff --git a/Machines/ColecoVision/ColecoVision.hpp b/Machines/ColecoVision/ColecoVision.hpp
index 180907541..c3a6fe8b0 100644
--- a/Machines/ColecoVision/ColecoVision.hpp
+++ b/Machines/ColecoVision/ColecoVision.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Commodore/1540/C1540.hpp b/Machines/Commodore/1540/C1540.hpp
index a5a815c62..21a20b0c1 100644
--- a/Machines/Commodore/1540/C1540.hpp
+++ b/Machines/Commodore/1540/C1540.hpp
@@ -25,9 +25,9 @@ enum class Personality {
 
 }
 
-#include "../SerialBus.hpp"
-#include "../../ROMMachine.hpp"
-#include "../../../Storage/Disk/Disk.hpp"
+#include "Machines/Commodore/SerialBus.hpp"
+#include "Machines/ROMMachine.hpp"
+#include "Storage/Disk/Disk.hpp"
 #include "Implementation/C1540Base.hpp"
 
 namespace Commodore::C1540 {
diff --git a/Machines/Commodore/1540/Implementation/C1540.cpp b/Machines/Commodore/1540/Implementation/C1540.cpp
index 80d729926..18ff68450 100644
--- a/Machines/Commodore/1540/Implementation/C1540.cpp
+++ b/Machines/Commodore/1540/Implementation/C1540.cpp
@@ -6,13 +6,13 @@
 //  Copyright 2016 Thomas Harte. All rights reserved.
 //
 
-#include "../C1540.hpp"
+#include "Machines/Commodore/1540/C1540.hpp"
 
 #include <cassert>
 #include <cstring>
 #include <string>
 
-#include "../../../../Storage/Disk/Encodings/CommodoreGCR.hpp"
+#include "Storage/Disk/Encodings/CommodoreGCR.hpp"
 
 using namespace Commodore::C1540;
 
diff --git a/Machines/Commodore/1540/Implementation/C1540Base.hpp b/Machines/Commodore/1540/Implementation/C1540Base.hpp
index 1ca119b26..b5c0a8270 100644
--- a/Machines/Commodore/1540/Implementation/C1540Base.hpp
+++ b/Machines/Commodore/1540/Implementation/C1540Base.hpp
@@ -8,17 +8,17 @@
 
 #pragma once
 
-#include "../../../../Processors/6502/6502.hpp"
-#include "../../../../Components/6522/6522.hpp"
+#include "Processors/6502/6502.hpp"
+#include "Components/6522/6522.hpp"
 
-#include "../../SerialBus.hpp"
+#include "Machines/Commodore/SerialBus.hpp"
 
-#include "../../../../Activity/Source.hpp"
-#include "../../../../Storage/Disk/Disk.hpp"
+#include "Activity/Source.hpp"
+#include "Storage/Disk/Disk.hpp"
 
-#include "../../../../Storage/Disk/Controller/DiskController.hpp"
+#include "Storage/Disk/Controller/DiskController.hpp"
 
-#include "../C1540.hpp"
+#include "Machines/Commodore/1540/C1540.hpp"
 
 namespace Commodore::C1540 {
 
diff --git a/Machines/Commodore/Plus4/Interrupts.hpp b/Machines/Commodore/Plus4/Interrupts.hpp
index 543fa40cb..e4a1400e4 100644
--- a/Machines/Commodore/Plus4/Interrupts.hpp
+++ b/Machines/Commodore/Plus4/Interrupts.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Processors/6502/6502.hpp"
+#include "Processors/6502/6502.hpp"
 
 namespace Commodore::Plus4 {
 
diff --git a/Machines/Commodore/Plus4/Keyboard.hpp b/Machines/Commodore/Plus4/Keyboard.hpp
index 171f3d04b..645f16eae 100644
--- a/Machines/Commodore/Plus4/Keyboard.hpp
+++ b/Machines/Commodore/Plus4/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../Utility/Typer.hpp"
+#include "KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Commodore::Plus4 {
 
diff --git a/Machines/Commodore/Plus4/Plus4.hpp b/Machines/Commodore/Plus4/Plus4.hpp
index c3e90bcaf..8854eee51 100644
--- a/Machines/Commodore/Plus4/Plus4.hpp
+++ b/Machines/Commodore/Plus4/Plus4.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Commodore/Vic-20/Keyboard.hpp b/Machines/Commodore/Vic-20/Keyboard.hpp
index 30432ae33..9ac62d340 100644
--- a/Machines/Commodore/Vic-20/Keyboard.hpp
+++ b/Machines/Commodore/Vic-20/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Commodore::Vic20 {
 
diff --git a/Machines/Commodore/Vic-20/Vic20.hpp b/Machines/Commodore/Vic-20/Vic20.hpp
index 1467ab8c6..c89d216a7 100644
--- a/Machines/Commodore/Vic-20/Vic20.hpp
+++ b/Machines/Commodore/Vic-20/Vic20.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/DynamicMachine.hpp b/Machines/DynamicMachine.hpp
index dd75eb439..5fbdada9b 100644
--- a/Machines/DynamicMachine.hpp
+++ b/Machines/DynamicMachine.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../Configurable/Configurable.hpp"
-#include "../Activity/Source.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Activity/Source.hpp"
 
 #include "MachineTypes.hpp"
 
diff --git a/Machines/Enterprise/EXDos.hpp b/Machines/Enterprise/EXDos.hpp
index 165adfcb0..b081786db 100644
--- a/Machines/Enterprise/EXDos.hpp
+++ b/Machines/Enterprise/EXDos.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../Components/1770/1770.hpp"
-#include "../../Activity/Observer.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Observer.hpp"
 
 namespace Enterprise {
 
diff --git a/Machines/Enterprise/Enterprise.hpp b/Machines/Enterprise/Enterprise.hpp
index d7673588e..96b3a6efb 100644
--- a/Machines/Enterprise/Enterprise.hpp
+++ b/Machines/Enterprise/Enterprise.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../ROMMachine.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Enterprise/Keyboard.hpp b/Machines/Enterprise/Keyboard.hpp
index 6496e72be..307ccad03 100644
--- a/Machines/Enterprise/Keyboard.hpp
+++ b/Machines/Enterprise/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../KeyboardMachine.hpp"
-#include "../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Enterprise {
 
diff --git a/Machines/JoystickMachine.hpp b/Machines/JoystickMachine.hpp
index d38144553..61657329b 100644
--- a/Machines/JoystickMachine.hpp
+++ b/Machines/JoystickMachine.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Inputs/Joystick.hpp"
+#include "Inputs/Joystick.hpp"
 #include <vector>
 
 namespace MachineTypes {
diff --git a/Machines/KeyboardMachine.hpp b/Machines/KeyboardMachine.hpp
index d13d3967b..731c8a015 100644
--- a/Machines/KeyboardMachine.hpp
+++ b/Machines/KeyboardMachine.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
+#include "Inputs/Keyboard.hpp"
+
 #include <bitset>
 #include <cstdint>
 #include <string>
 #include <set>
 
-#include "../Inputs/Keyboard.hpp"
-
 namespace MachineTypes {
 
 /*!
diff --git a/Machines/MSX/Cartridges/ASCII16kb.hpp b/Machines/MSX/Cartridges/ASCII16kb.hpp
index 8eeb1e8dc..a635a3d37 100644
--- a/Machines/MSX/Cartridges/ASCII16kb.hpp
+++ b/Machines/MSX/Cartridges/ASCII16kb.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../MemorySlotHandler.hpp"
+#include "Machines/MSX/MemorySlotHandler.hpp"
 
 namespace MSX::Cartridge {
 
diff --git a/Machines/MSX/Cartridges/ASCII8kb.hpp b/Machines/MSX/Cartridges/ASCII8kb.hpp
index 60b4d0d6d..204cf02e8 100644
--- a/Machines/MSX/Cartridges/ASCII8kb.hpp
+++ b/Machines/MSX/Cartridges/ASCII8kb.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../MemorySlotHandler.hpp"
+#include "Machines/MSX/MemorySlotHandler.hpp"
 
 namespace MSX::Cartridge {
 
diff --git a/Machines/MSX/Cartridges/Konami.hpp b/Machines/MSX/Cartridges/Konami.hpp
index fde8be9b9..faca74e3c 100644
--- a/Machines/MSX/Cartridges/Konami.hpp
+++ b/Machines/MSX/Cartridges/Konami.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../MemorySlotHandler.hpp"
+#include "Machines/MSX/MemorySlotHandler.hpp"
 
 namespace MSX::Cartridge {
 
diff --git a/Machines/MSX/Cartridges/KonamiWithSCC.hpp b/Machines/MSX/Cartridges/KonamiWithSCC.hpp
index 8fb22752f..51438c3a1 100644
--- a/Machines/MSX/Cartridges/KonamiWithSCC.hpp
+++ b/Machines/MSX/Cartridges/KonamiWithSCC.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../MemorySlotHandler.hpp"
-#include "../../../Components/KonamiSCC/KonamiSCC.hpp"
+#include "Machines/MSX/MemorySlotHandler.hpp"
+#include "Components/KonamiSCC/KonamiSCC.hpp"
 
 namespace MSX::Cartridge {
 
diff --git a/Machines/MSX/DiskROM.hpp b/Machines/MSX/DiskROM.hpp
index 1738f24d2..c4bff86a9 100644
--- a/Machines/MSX/DiskROM.hpp
+++ b/Machines/MSX/DiskROM.hpp
@@ -10,8 +10,8 @@
 
 #include "MemorySlotHandler.hpp"
 
-#include "../../Activity/Source.hpp"
-#include "../../Components/1770/1770.hpp"
+#include "Activity/Source.hpp"
+#include "Components/1770/1770.hpp"
 
 #include <array>
 #include <cstdint>
diff --git a/Machines/MSX/Keyboard.hpp b/Machines/MSX/Keyboard.hpp
index 6aef9a189..a25886090 100644
--- a/Machines/MSX/Keyboard.hpp
+++ b/Machines/MSX/Keyboard.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../KeyboardMachine.hpp"
+#include "Machines/KeyboardMachine.hpp"
 
 namespace MSX {
 
diff --git a/Machines/MSX/MSX.hpp b/Machines/MSX/MSX.hpp
index 9e3ff5ac4..c36315601 100644
--- a/Machines/MSX/MSX.hpp
+++ b/Machines/MSX/MSX.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/MSX/MemorySlotHandler.hpp b/Machines/MSX/MemorySlotHandler.hpp
index 8d29393b0..9bd6d18eb 100644
--- a/Machines/MSX/MemorySlotHandler.hpp
+++ b/Machines/MSX/MemorySlotHandler.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../Analyser/Dynamic/ConfidenceCounter.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Analyser/Dynamic/ConfidenceCounter.hpp"
 
 #include <array>
 #include <cstddef>
diff --git a/Machines/MasterSystem/MasterSystem.hpp b/Machines/MasterSystem/MasterSystem.hpp
index 9c2832b0c..d97df8df1 100644
--- a/Machines/MasterSystem/MasterSystem.hpp
+++ b/Machines/MasterSystem/MasterSystem.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/MediaTarget.hpp b/Machines/MediaTarget.hpp
index b2ef60b41..ea1089367 100644
--- a/Machines/MediaTarget.hpp
+++ b/Machines/MediaTarget.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../Analyser/Static/StaticAnalyser.hpp"
-#include "../Configurable/Configurable.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Configurable/Configurable.hpp"
 
 #include <string>
 
diff --git a/Machines/MouseMachine.hpp b/Machines/MouseMachine.hpp
index 56cf5f2b7..f8cdf1ebd 100644
--- a/Machines/MouseMachine.hpp
+++ b/Machines/MouseMachine.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Inputs/Mouse.hpp"
+#include "Inputs/Mouse.hpp"
 
 namespace MachineTypes {
 
diff --git a/Machines/Oric/BD500.hpp b/Machines/Oric/BD500.hpp
index fe078f24c..b6ec39055 100644
--- a/Machines/Oric/BD500.hpp
+++ b/Machines/Oric/BD500.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../Components/1770/1770.hpp"
-#include "../../Activity/Observer.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Observer.hpp"
 #include "DiskController.hpp"
 
 #include <array>
diff --git a/Machines/Oric/Jasmin.hpp b/Machines/Oric/Jasmin.hpp
index 636d63f69..fcd12b0ab 100644
--- a/Machines/Oric/Jasmin.hpp
+++ b/Machines/Oric/Jasmin.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../Components/1770/1770.hpp"
-#include "../../Activity/Observer.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Observer.hpp"
 #include "DiskController.hpp"
 
 namespace Oric {
diff --git a/Machines/Oric/Keyboard.hpp b/Machines/Oric/Keyboard.hpp
index 2929b4a3a..0468f5a0f 100644
--- a/Machines/Oric/Keyboard.hpp
+++ b/Machines/Oric/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../KeyboardMachine.hpp"
-#include "../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Oric {
 
diff --git a/Machines/Oric/Microdisc.hpp b/Machines/Oric/Microdisc.hpp
index 02b0a370f..5eda117a8 100644
--- a/Machines/Oric/Microdisc.hpp
+++ b/Machines/Oric/Microdisc.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../Components/1770/1770.hpp"
-#include "../../Activity/Observer.hpp"
+#include "Components/1770/1770.hpp"
+#include "Activity/Observer.hpp"
 #include "DiskController.hpp"
 
 namespace Oric {
diff --git a/Machines/Oric/Oric.hpp b/Machines/Oric/Oric.hpp
index c6cddcbe4..e968933ea 100644
--- a/Machines/Oric/Oric.hpp
+++ b/Machines/Oric/Oric.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/PCCompatible/DMA.hpp b/Machines/PCCompatible/DMA.hpp
index c4f33c8ca..e0d590b38 100644
--- a/Machines/PCCompatible/DMA.hpp
+++ b/Machines/PCCompatible/DMA.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Numeric/RegisterSizes.hpp"
+#include "Numeric/RegisterSizes.hpp"
 
 #include "Memory.hpp"
 
diff --git a/Machines/PCCompatible/KeyboardMapper.hpp b/Machines/PCCompatible/KeyboardMapper.hpp
index f17233bd9..ddc331335 100644
--- a/Machines/PCCompatible/KeyboardMapper.hpp
+++ b/Machines/PCCompatible/KeyboardMapper.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../KeyboardMachine.hpp"
+#include "Machines/KeyboardMachine.hpp"
 
 namespace PCCompatible {
 
diff --git a/Machines/PCCompatible/Memory.hpp b/Machines/PCCompatible/Memory.hpp
index ccb988f4b..831dca126 100644
--- a/Machines/PCCompatible/Memory.hpp
+++ b/Machines/PCCompatible/Memory.hpp
@@ -11,7 +11,7 @@
 #include "Registers.hpp"
 #include "Segments.hpp"
 
-#include "../../InstructionSets/x86/AccessType.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
 
 #include <array>
 
diff --git a/Machines/PCCompatible/PCCompatible.hpp b/Machines/PCCompatible/PCCompatible.hpp
index b891998f9..55541864e 100644
--- a/Machines/PCCompatible/PCCompatible.hpp
+++ b/Machines/PCCompatible/PCCompatible.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../Configurable/Configurable.hpp"
-#include "../../Configurable/StandardOptions.hpp"
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 namespace PCCompatible {
 
diff --git a/Machines/PCCompatible/Segments.hpp b/Machines/PCCompatible/Segments.hpp
index 9ca6b1c2e..b6e143ee1 100644
--- a/Machines/PCCompatible/Segments.hpp
+++ b/Machines/PCCompatible/Segments.hpp
@@ -10,7 +10,7 @@
 
 #include "Registers.hpp"
 
-#include "../../InstructionSets/x86/Instruction.hpp"
+#include "InstructionSets/x86/Instruction.hpp"
 
 namespace PCCompatible {
 
diff --git a/Machines/Sinclair/Keyboard/Keyboard.hpp b/Machines/Sinclair/Keyboard/Keyboard.hpp
index 292149934..0018b6ac8 100644
--- a/Machines/Sinclair/Keyboard/Keyboard.hpp
+++ b/Machines/Sinclair/Keyboard/Keyboard.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../KeyboardMachine.hpp"
-#include "../../Utility/Typer.hpp"
+#include "Machines/KeyboardMachine.hpp"
+#include "Machines/Utility/Typer.hpp"
 
 namespace Sinclair::ZX::Keyboard {
 
diff --git a/Machines/Sinclair/ZX8081/ZX8081.cpp b/Machines/Sinclair/ZX8081/ZX8081.cpp
index 766f70352..f4c9d61c5 100644
--- a/Machines/Sinclair/ZX8081/ZX8081.cpp
+++ b/Machines/Sinclair/ZX8081/ZX8081.cpp
@@ -24,7 +24,7 @@
 
 #include "Analyser/Static/ZX8081/Target.hpp"
 
-#include "../Keyboard/Keyboard.hpp"
+#include "Machines/Sinclair/Keyboard/Keyboard.hpp"
 #include "Video.hpp"
 
 #include <cstdint>
diff --git a/Machines/Sinclair/ZX8081/ZX8081.hpp b/Machines/Sinclair/ZX8081/ZX8081.hpp
index 9c53f9a23..cc477d1c2 100644
--- a/Machines/Sinclair/ZX8081/ZX8081.hpp
+++ b/Machines/Sinclair/ZX8081/ZX8081.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/Sinclair/ZXSpectrum/State.hpp b/Machines/Sinclair/ZXSpectrum/State.hpp
index 7eeb13d14..9d8c0e9b8 100644
--- a/Machines/Sinclair/ZXSpectrum/State.hpp
+++ b/Machines/Sinclair/ZXSpectrum/State.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "../../../Reflection/Struct.hpp"
-#include "../../../Processors/Z80/State/State.hpp"
+#include "Reflection/Struct.hpp"
+#include "Processors/Z80/State/State.hpp"
 
 #include "Video.hpp"
-#include "../../../Components/AY38910/AY38910.hpp"
+#include "Components/AY38910/AY38910.hpp"
 
 namespace Sinclair::ZXSpectrum {
 
diff --git a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp
index edb88c2f3..77103413a 100644
--- a/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp
+++ b/Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../../../Configurable/Configurable.hpp"
-#include "../../../Configurable/StandardOptions.hpp"
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../ROMMachine.hpp"
+#include "Configurable/Configurable.hpp"
+#include "Configurable/StandardOptions.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <memory>
 
diff --git a/Machines/StateProducer.hpp b/Machines/StateProducer.hpp
index 23b8de517..88d80be4b 100644
--- a/Machines/StateProducer.hpp
+++ b/Machines/StateProducer.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include <memory>
-#include "../Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
 
 namespace MachineTypes {
 
diff --git a/Machines/TimedMachine.hpp b/Machines/TimedMachine.hpp
index a13a42233..8b5de7c20 100644
--- a/Machines/TimedMachine.hpp
+++ b/Machines/TimedMachine.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../ClockReceiver/ClockReceiver.hpp"
-#include "../ClockReceiver/TimeTypes.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/TimeTypes.hpp"
 
 #include "AudioProducer.hpp"
 
diff --git a/Machines/Utility/MachineForTarget.cpp b/Machines/Utility/MachineForTarget.cpp
index a541213b2..adf11df08 100644
--- a/Machines/Utility/MachineForTarget.cpp
+++ b/Machines/Utility/MachineForTarget.cpp
@@ -11,45 +11,45 @@
 #include <algorithm>
 
 // Sources for runtime options and machines.
-#include "../Acorn/Archimedes/Archimedes.hpp"
-#include "../Acorn/Electron/Electron.hpp"
-#include "../Amiga/Amiga.hpp"
-#include "../AmstradCPC/AmstradCPC.hpp"
-#include "../Apple/AppleII/AppleII.hpp"
-#include "../Apple/AppleIIgs/AppleIIgs.hpp"
-#include "../Apple/Macintosh/Macintosh.hpp"
-#include "../Atari/2600/Atari2600.hpp"
-#include "../Atari/ST/AtariST.hpp"
-#include "../ColecoVision/ColecoVision.hpp"
-#include "../Commodore/Plus4/Plus4.hpp"
-#include "../Commodore/Vic-20/Vic20.hpp"
-#include "../Enterprise/Enterprise.hpp"
-#include "../MasterSystem/MasterSystem.hpp"
-#include "../MSX/MSX.hpp"
-#include "../Oric/Oric.hpp"
-#include "../PCCompatible/PCCompatible.hpp"
-#include "../Sinclair/ZX8081/ZX8081.hpp"
-#include "../Sinclair/ZXSpectrum/ZXSpectrum.hpp"
+#include "Machines/Acorn/Archimedes/Archimedes.hpp"
+#include "Machines/Acorn/Electron/Electron.hpp"
+#include "Machines/Amiga/Amiga.hpp"
+#include "Machines/AmstradCPC/AmstradCPC.hpp"
+#include "Machines/Apple/AppleII/AppleII.hpp"
+#include "Machines/Apple/AppleIIgs/AppleIIgs.hpp"
+#include "Machines/Apple/Macintosh/Macintosh.hpp"
+#include "Machines/Atari/2600/Atari2600.hpp"
+#include "Machines/Atari/ST/AtariST.hpp"
+#include "Machines/ColecoVision/ColecoVision.hpp"
+#include "Machines/Commodore/Plus4/Plus4.hpp"
+#include "Machines/Commodore/Vic-20/Vic20.hpp"
+#include "Machines/Enterprise/Enterprise.hpp"
+#include "Machines/MasterSystem/MasterSystem.hpp"
+#include "Machines/MSX/MSX.hpp"
+#include "Machines/Oric/Oric.hpp"
+#include "Machines/PCCompatible/PCCompatible.hpp"
+#include "Machines/Sinclair/ZX8081/ZX8081.hpp"
+#include "Machines/Sinclair/ZXSpectrum/ZXSpectrum.hpp"
 
 // Sources for construction options.
-#include "../../Analyser/Static/Acorn/Target.hpp"
-#include "../../Analyser/Static/Amiga/Target.hpp"
-#include "../../Analyser/Static/AmstradCPC/Target.hpp"
-#include "../../Analyser/Static/AppleII/Target.hpp"
-#include "../../Analyser/Static/AppleIIgs/Target.hpp"
-#include "../../Analyser/Static/Atari2600/Target.hpp"
-#include "../../Analyser/Static/AtariST/Target.hpp"
-#include "../../Analyser/Static/Commodore/Target.hpp"
-#include "../../Analyser/Static/Enterprise/Target.hpp"
-#include "../../Analyser/Static/Macintosh/Target.hpp"
-#include "../../Analyser/Static/MSX/Target.hpp"
-#include "../../Analyser/Static/Oric/Target.hpp"
-#include "../../Analyser/Static/PCCompatible/Target.hpp"
-#include "../../Analyser/Static/Sega/Target.hpp"
-#include "../../Analyser/Static/ZX8081/Target.hpp"
-#include "../../Analyser/Static/ZXSpectrum/Target.hpp"
+#include "Analyser/Static/Acorn/Target.hpp"
+#include "Analyser/Static/Amiga/Target.hpp"
+#include "Analyser/Static/AmstradCPC/Target.hpp"
+#include "Analyser/Static/AppleII/Target.hpp"
+#include "Analyser/Static/AppleIIgs/Target.hpp"
+#include "Analyser/Static/Atari2600/Target.hpp"
+#include "Analyser/Static/AtariST/Target.hpp"
+#include "Analyser/Static/Commodore/Target.hpp"
+#include "Analyser/Static/Enterprise/Target.hpp"
+#include "Analyser/Static/Macintosh/Target.hpp"
+#include "Analyser/Static/MSX/Target.hpp"
+#include "Analyser/Static/Oric/Target.hpp"
+#include "Analyser/Static/PCCompatible/Target.hpp"
+#include "Analyser/Static/Sega/Target.hpp"
+#include "Analyser/Static/ZX8081/Target.hpp"
+#include "Analyser/Static/ZXSpectrum/Target.hpp"
 
-#include "../../Analyser/Dynamic/MultiMachine/MultiMachine.hpp"
+#include "Analyser/Dynamic/MultiMachine/MultiMachine.hpp"
 #include "TypedDynamicMachine.hpp"
 
 std::unique_ptr<Machine::DynamicMachine> Machine::MachineForTarget(const Analyser::Static::Target *target, const ROMMachine::ROMFetcher &rom_fetcher, Machine::Error &error) {
diff --git a/Machines/Utility/MachineForTarget.hpp b/Machines/Utility/MachineForTarget.hpp
index 231e84b74..835f3ba62 100644
--- a/Machines/Utility/MachineForTarget.hpp
+++ b/Machines/Utility/MachineForTarget.hpp
@@ -8,11 +8,11 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../Reflection/Struct.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Reflection/Struct.hpp"
 
-#include "../DynamicMachine.hpp"
-#include "../ROMMachine.hpp"
+#include "Machines/DynamicMachine.hpp"
+#include "Machines/ROMMachine.hpp"
 
 #include <map>
 #include <memory>
diff --git a/Machines/Utility/Typer.hpp b/Machines/Utility/Typer.hpp
index 4bb479351..7dee60b08 100644
--- a/Machines/Utility/Typer.hpp
+++ b/Machines/Utility/Typer.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
+#include "Machines/KeyboardMachine.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+
 #include <array>
 #include <memory>
 #include <string>
 
-#include "../KeyboardMachine.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
-
 namespace Utility {
 
 /*!
diff --git a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm
index 7a3ea34b7..a8e9f638f 100644
--- a/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm	
+++ b/OSBindings/Mac/Clock Signal/Machine/CSMachine.mm	
@@ -20,11 +20,11 @@
 #include "MachineForTarget.hpp"
 #include "StandardOptions.hpp"
 #include "Typer.hpp"
-#include "../../../../Activity/Observer.hpp"
+#include "Activity/Observer.hpp"
 
-#include "../../../../ClockReceiver/TimeTypes.hpp"
-#include "../../../../ClockReceiver/ScanSynchroniser.hpp"
-#include "../../../../Concurrency/AsyncTaskQueue.hpp"
+#include "ClockReceiver/TimeTypes.hpp"
+#include "ClockReceiver/ScanSynchroniser.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
 
 #import "CSStaticAnalyser+TargetVector.h"
 #import "NSBundle+DataResource.h"
diff --git a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm
index 75f865df3..a17860b88 100644
--- a/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
+++ b/OSBindings/Mac/Clock Signal/Machine/StaticAnalyser/CSStaticAnalyser.mm	
@@ -13,20 +13,20 @@
 
 #include "StaticAnalyser.hpp"
 
-#include "../../../../../Analyser/Static/Acorn/Target.hpp"
-#include "../../../../../Analyser/Static/Amiga/Target.hpp"
-#include "../../../../../Analyser/Static/AmstradCPC/Target.hpp"
-#include "../../../../../Analyser/Static/AppleII/Target.hpp"
-#include "../../../../../Analyser/Static/AppleIIgs/Target.hpp"
-#include "../../../../../Analyser/Static/AtariST/Target.hpp"
-#include "../../../../../Analyser/Static/Commodore/Target.hpp"
-#include "../../../../../Analyser/Static/Enterprise/Target.hpp"
-#include "../../../../../Analyser/Static/Macintosh/Target.hpp"
-#include "../../../../../Analyser/Static/MSX/Target.hpp"
-#include "../../../../../Analyser/Static/Oric/Target.hpp"
-#include "../../../../../Analyser/Static/PCCompatible/Target.hpp"
-#include "../../../../../Analyser/Static/ZX8081/Target.hpp"
-#include "../../../../../Analyser/Static/ZXSpectrum/Target.hpp"
+#include "Analyser/Static/Acorn/Target.hpp"
+#include "Analyser/Static/Amiga/Target.hpp"
+#include "Analyser/Static/AmstradCPC/Target.hpp"
+#include "Analyser/Static/AppleII/Target.hpp"
+#include "Analyser/Static/AppleIIgs/Target.hpp"
+#include "Analyser/Static/AtariST/Target.hpp"
+#include "Analyser/Static/Commodore/Target.hpp"
+#include "Analyser/Static/Enterprise/Target.hpp"
+#include "Analyser/Static/Macintosh/Target.hpp"
+#include "Analyser/Static/MSX/Target.hpp"
+#include "Analyser/Static/Oric/Target.hpp"
+#include "Analyser/Static/PCCompatible/Target.hpp"
+#include "Analyser/Static/ZX8081/Target.hpp"
+#include "Analyser/Static/ZXSpectrum/Target.hpp"
 
 #import "Clock_Signal-Swift.h"
 
diff --git a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm
index 0a9add65e..3f677466d 100644
--- a/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/68000ComparativeTests.mm	
@@ -8,9 +8,9 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Processors/68000/68000.hpp"
-#include "../../../InstructionSets/M68k/Executor.hpp"
-#include "../../../InstructionSets/M68k/Decoder.hpp"
+#include "Processors/68000/68000.hpp"
+#include "InstructionSets/M68k/Executor.hpp"
+#include "InstructionSets/M68k/Decoder.hpp"
 
 #include <array>
 #include <memory>
diff --git a/OSBindings/Mac/Clock SignalTests/68000DecoderTests.mm b/OSBindings/Mac/Clock SignalTests/68000DecoderTests.mm
index 917515c91..02e9e7248 100644
--- a/OSBindings/Mac/Clock SignalTests/68000DecoderTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/68000DecoderTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../InstructionSets/M68k/Decoder.hpp"
+#include "InstructionSets/M68k/Decoder.hpp"
 
 using namespace InstructionSet::M68k;
 
diff --git a/OSBindings/Mac/Clock SignalTests/68000flamewingTests.mm b/OSBindings/Mac/Clock SignalTests/68000flamewingTests.mm
index a39177870..2faefe2fb 100644
--- a/OSBindings/Mac/Clock SignalTests/68000flamewingTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/68000flamewingTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../InstructionSets/M68k/Perform.hpp"
+#include "InstructionSets/M68k/Perform.hpp"
 
 using namespace InstructionSet::M68k;
 
diff --git a/OSBindings/Mac/Clock SignalTests/6809OperationMapperTests.mm b/OSBindings/Mac/Clock SignalTests/6809OperationMapperTests.mm
index f8757a8c9..3f721aa28 100644
--- a/OSBindings/Mac/Clock SignalTests/6809OperationMapperTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/6809OperationMapperTests.mm	
@@ -10,7 +10,7 @@
 #import <XCTest/XCTest.h>
 
 #include "Dispatcher.hpp"
-#include "../../../InstructionSets/6809/OperationMapper.hpp"
+#include "InstructionSets/6809/OperationMapper.hpp"
 
 using namespace InstructionSet::M6809;
 
diff --git a/OSBindings/Mac/Clock SignalTests/8088Tests.mm b/OSBindings/Mac/Clock SignalTests/8088Tests.mm
index a79bb8de9..413f52686 100644
--- a/OSBindings/Mac/Clock SignalTests/8088Tests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/8088Tests.mm	
@@ -20,11 +20,11 @@
 
 #include "NSData+dataWithContentsOfGZippedFile.h"
 
-#include "../../../InstructionSets/x86/AccessType.hpp"
-#include "../../../InstructionSets/x86/Decoder.hpp"
-#include "../../../InstructionSets/x86/Perform.hpp"
-#include "../../../InstructionSets/x86/Flags.hpp"
-#include "../../../Numeric/RegisterSizes.hpp"
+#include "InstructionSets/x86/AccessType.hpp"
+#include "InstructionSets/x86/Decoder.hpp"
+#include "InstructionSets/x86/Perform.hpp"
+#include "InstructionSets/x86/Flags.hpp"
+#include "Numeric/RegisterSizes.hpp"
 
 namespace {
 
diff --git a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm
index 5885f30f6..ebcfc38d0 100644
--- a/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/ARMDecoderTests.mm	
@@ -8,8 +8,8 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../InstructionSets/ARM/Disassembler.hpp"
-#include "../../../InstructionSets/ARM/Executor.hpp"
+#include "InstructionSets/ARM/Disassembler.hpp"
+#include "InstructionSets/ARM/Executor.hpp"
 
 #include "NSData+dataWithContentsOfGZippedFile.h"
 
diff --git a/OSBindings/Mac/Clock SignalTests/ArchimedesStaticAnalyserTests.mm b/OSBindings/Mac/Clock SignalTests/ArchimedesStaticAnalyserTests.mm
index 6e87e8047..30834a39a 100644
--- a/OSBindings/Mac/Clock SignalTests/ArchimedesStaticAnalyserTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/ArchimedesStaticAnalyserTests.mm	
@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 
 #import <CommonCrypto/CommonDigest.h>
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../../Analyser/Static/Acorn/Target.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/Acorn/Target.hpp"
 
 static NSString *archimedesDiskPath = @"/Users/thomasharte/Library/Mobile Documents/com~apple~CloudDocs/Soft/Archimedes";
 
diff --git a/OSBindings/Mac/Clock SignalTests/AtariSTVideoTests.mm b/OSBindings/Mac/Clock SignalTests/AtariSTVideoTests.mm
index 0dfe03ddb..a451ebd60 100644
--- a/OSBindings/Mac/Clock SignalTests/AtariSTVideoTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/AtariSTVideoTests.mm	
@@ -10,7 +10,7 @@
 
 #include <memory>
 
-#include "../../../Machines/Atari/ST/Video.hpp"
+#include "Machines/Atari/ST/Video.hpp"
 
 // Implement Atari::ST::Video's friend class, to expose some
 // internal state.
diff --git a/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm b/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm
index 6fdbe160e..77d6707b0 100644
--- a/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/AtariStaticAnalyserTests.mm	
@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 
 #import <CommonCrypto/CommonDigest.h>
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../../Analyser/Static/Atari2600/Target.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/Atari2600/Target.hpp"
 
 using PagingModel = Analyser::Static::Atari2600::Target::PagingModel;
 
diff --git a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm
index ae7768f8b..f1c14a2cb 100644
--- a/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm	
+++ b/OSBindings/Mac/Clock SignalTests/Bridges/TestMachine6502.mm	
@@ -7,9 +7,9 @@
 //
 
 #import "TestMachine6502.h"
-#include <stdint.h>
-#include "../../../../Processors/6502/AllRAM/6502AllRAM.hpp"
+#include "Processors/6502/AllRAM/6502AllRAM.hpp"
 #import "TestMachine+ForSubclassEyesOnly.h"
+#include <cstdint>
 
 const uint8_t CSTestMachine6502JamOpcode = CPU::MOS6502::JamOpcode;
 
diff --git a/OSBindings/Mac/Clock SignalTests/CommodoreStaticAnalyserTests.mm b/OSBindings/Mac/Clock SignalTests/CommodoreStaticAnalyserTests.mm
index fb9b8a26c..369607d23 100644
--- a/OSBindings/Mac/Clock SignalTests/CommodoreStaticAnalyserTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/CommodoreStaticAnalyserTests.mm	
@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 
 #import <CommonCrypto/CommonDigest.h>
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../../Analyser/Static/Commodore/Target.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/Commodore/Target.hpp"
 
 #include <atomic>
 
diff --git a/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm b/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm
index 435b3325e..bab7f7670 100644
--- a/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/DingusdevPowerPCTests.mm	
@@ -8,10 +8,9 @@
 
 #import <XCTest/XCTest.h>
 
+#include "InstructionSets/PowerPC/Decoder.hpp"
 #include <cstdlib>
 
-#include "../../../InstructionSets/PowerPC/Decoder.hpp"
-
 using namespace InstructionSet::PowerPC;
 
 @interface NSString (HexConversion)
diff --git a/OSBindings/Mac/Clock SignalTests/EnterpriseDaveTests.mm b/OSBindings/Mac/Clock SignalTests/EnterpriseDaveTests.mm
index 50eb74f5d..15f9b6580 100644
--- a/OSBindings/Mac/Clock SignalTests/EnterpriseDaveTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/EnterpriseDaveTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Machines/Enterprise/Dave.hpp"
+#include "Machines/Enterprise/Dave.hpp"
 #include <memory>
 
 @interface EnterpriseDaveTests : XCTestCase
diff --git a/OSBindings/Mac/Clock SignalTests/EnterpriseNickTests.mm b/OSBindings/Mac/Clock SignalTests/EnterpriseNickTests.mm
index fee0e2842..cdf709e09 100644
--- a/OSBindings/Mac/Clock SignalTests/EnterpriseNickTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/EnterpriseNickTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Machines/Enterprise/Nick.hpp"
+#include "Machines/Enterprise/Nick.hpp"
 #include <memory>
 
 @interface EnterpriseNickTests : XCTestCase
diff --git a/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm b/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm
index 28d098aa0..20c1522c3 100644
--- a/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/IIgsMemoryMapTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Machines/Apple/AppleIIgs/MemoryMap.hpp"
+#include "Machines/Apple/AppleIIgs/MemoryMap.hpp"
 
 namespace {
 	// Test the ROM03-era mapping hardware.
diff --git a/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm b/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm
index 66af90c2c..a81e24f4d 100644
--- a/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/MSXStaticAnalyserTests.mm	
@@ -9,8 +9,8 @@
 #import <XCTest/XCTest.h>
 
 #import <CommonCrypto/CommonDigest.h>
-#include "../../../Analyser/Static/StaticAnalyser.hpp"
-#include "../../../Analyser/Static/MSX/Cartridge.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/MSX/Cartridge.hpp"
 
 @interface MSXROMRecord : NSObject
 @property(nonatomic, readonly) Analyser::Static::MSX::Cartridge::Type cartridgeType;
diff --git a/OSBindings/Mac/Clock SignalTests/MacGCRTests.mm b/OSBindings/Mac/Clock SignalTests/MacGCRTests.mm
index 16c61f431..18c931437 100644
--- a/OSBindings/Mac/Clock SignalTests/MacGCRTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/MacGCRTests.mm	
@@ -8,10 +8,9 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Storage/Disk/Encodings/AppleGCR/Encoder.hpp"
-
-#include "../../../Storage/Disk/Track/TrackSerialiser.hpp"
-#include "../../../Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/Encoder.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"
 
 @interface MacGCRTests : XCTestCase
 @end
diff --git a/OSBindings/Mac/Clock SignalTests/MacintoshVideoTests.mm b/OSBindings/Mac/Clock SignalTests/MacintoshVideoTests.mm
index 2772ae7f2..6699a023d 100644
--- a/OSBindings/Mac/Clock SignalTests/MacintoshVideoTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/MacintoshVideoTests.mm	
@@ -9,7 +9,7 @@
 #import <XCTest/XCTest.h>
 
 #include <memory>
-#include "../../../Machines/Apple/Macintosh/Video.hpp"
+#include "Machines/Apple/Macintosh/Video.hpp"
 
 @interface MacintoshVideoTests : XCTestCase
 @end
diff --git a/OSBindings/Mac/Clock SignalTests/PowerPCDecoderTests.mm b/OSBindings/Mac/Clock SignalTests/PowerPCDecoderTests.mm
index f6e2f0a2d..40afdce5a 100644
--- a/OSBindings/Mac/Clock SignalTests/PowerPCDecoderTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/PowerPCDecoderTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../InstructionSets/PowerPC/Decoder.hpp"
+#include "InstructionSets/PowerPC/Decoder.hpp"
 
 namespace {
 	using Operation = InstructionSet::PowerPC::Operation;
diff --git a/OSBindings/Mac/Clock SignalTests/SpectrumVideoContentionTests.mm b/OSBindings/Mac/Clock SignalTests/SpectrumVideoContentionTests.mm
index c3c1c4cdc..fc7edc2b6 100644
--- a/OSBindings/Mac/Clock SignalTests/SpectrumVideoContentionTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/SpectrumVideoContentionTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Machines/Sinclair/ZXSpectrum/Video.hpp"
+#include "Machines/Sinclair/ZXSpectrum/Video.hpp"
 
 @interface SpectrumVideoContentionTests : XCTestCase
 @end
diff --git a/OSBindings/Mac/Clock SignalTests/TestRunner68000.hpp b/OSBindings/Mac/Clock SignalTests/TestRunner68000.hpp
index c860578c3..0c65373e0 100644
--- a/OSBindings/Mac/Clock SignalTests/TestRunner68000.hpp	
+++ b/OSBindings/Mac/Clock SignalTests/TestRunner68000.hpp	
@@ -12,7 +12,7 @@
 #include <functional>
 #include <vector>
 
-#include "../../../Processors/68000/68000.hpp"
+#include "Processors/68000/68000.hpp"
 
 using namespace InstructionSet::M68k;
 
diff --git a/OSBindings/Mac/Clock SignalTests/TimeTests.mm b/OSBindings/Mac/Clock SignalTests/TimeTests.mm
index 9f7b1755a..273c8a789 100644
--- a/OSBindings/Mac/Clock SignalTests/TimeTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/TimeTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Storage/Storage.hpp"
+#include "Storage/Storage.hpp"
 
 @interface TimeTests : XCTestCase
 @end
diff --git a/OSBindings/Mac/Clock SignalTests/Z80ContentionTests.mm b/OSBindings/Mac/Clock SignalTests/Z80ContentionTests.mm
index 0ce20c6f9..95fc19789 100644
--- a/OSBindings/Mac/Clock SignalTests/Z80ContentionTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/Z80ContentionTests.mm	
@@ -8,7 +8,7 @@
 
 #import <XCTest/XCTest.h>
 
-#include "../../../Processors/Z80/Z80.hpp"
+#include "Processors/Z80/Z80.hpp"
 
 namespace {
 
diff --git a/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm b/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm
index b246d9383..b0dc1a27d 100644
--- a/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm	
+++ b/OSBindings/Mac/Clock SignalTests/x86DecoderTests.mm	
@@ -8,10 +8,11 @@
 
 #import <XCTest/XCTest.h>
 
+#include "InstructionSets/x86/Decoder.hpp"
+
 #include <initializer_list>
 #include <optional>
 #include <vector>
-#include "../../../InstructionSets/x86/Decoder.hpp"
 
 using namespace InstructionSet::x86;
 
diff --git a/Outputs/CRT/CRT.hpp b/Outputs/CRT/CRT.hpp
index a8204bab1..59b8ecd88 100644
--- a/Outputs/CRT/CRT.hpp
+++ b/Outputs/CRT/CRT.hpp
@@ -13,7 +13,7 @@
 #include <limits>
 #include <memory>
 
-#include "../ScanTarget.hpp"
+#include "Outputs/ScanTarget.hpp"
 #include "Internals/Flywheel.hpp"
 
 namespace Outputs::CRT {
diff --git a/Outputs/OpenGL/Primitives/Rectangle.hpp b/Outputs/OpenGL/Primitives/Rectangle.hpp
index bbe6d1fb2..40ed10daf 100644
--- a/Outputs/OpenGL/Primitives/Rectangle.hpp
+++ b/Outputs/OpenGL/Primitives/Rectangle.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../OpenGL.hpp"
+#include "Outputs/OpenGL/OpenGL.hpp"
 #include "Shader.hpp"
 #include <memory>
 
diff --git a/Outputs/OpenGL/Primitives/Shader.cpp b/Outputs/OpenGL/Primitives/Shader.cpp
index d547fa623..b3a0b5cd4 100644
--- a/Outputs/OpenGL/Primitives/Shader.cpp
+++ b/Outputs/OpenGL/Primitives/Shader.cpp
@@ -8,7 +8,7 @@
 
 #include "Shader.hpp"
 
-#include "../../Log.hpp"
+#include "Outputs/Log.hpp"
 #include <vector>
 
 using namespace Outputs::Display::OpenGL;
diff --git a/Outputs/OpenGL/Primitives/Shader.hpp b/Outputs/OpenGL/Primitives/Shader.hpp
index d53a2ae36..7d9808c22 100644
--- a/Outputs/OpenGL/Primitives/Shader.hpp
+++ b/Outputs/OpenGL/Primitives/Shader.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../OpenGL.hpp"
+#include "Outputs/OpenGL/OpenGL.hpp"
 
 #include <functional>
 #include <mutex>
diff --git a/Outputs/OpenGL/Primitives/TextureTarget.hpp b/Outputs/OpenGL/Primitives/TextureTarget.hpp
index a26fc13b3..1ced7a8c7 100644
--- a/Outputs/OpenGL/Primitives/TextureTarget.hpp
+++ b/Outputs/OpenGL/Primitives/TextureTarget.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../OpenGL.hpp"
+#include "Outputs/OpenGL/OpenGL.hpp"
 #include "Shader.hpp"
 #include <memory>
 
diff --git a/Outputs/OpenGL/ScanTarget.hpp b/Outputs/OpenGL/ScanTarget.hpp
index cb66eee60..99389b25f 100644
--- a/Outputs/OpenGL/ScanTarget.hpp
+++ b/Outputs/OpenGL/ScanTarget.hpp
@@ -8,15 +8,15 @@
 
 #pragma once
 
-#include "../Log.hpp"
-#include "../DisplayMetrics.hpp"
-#include "../ScanTargets/BufferingScanTarget.hpp"
+#include "Outputs/Log.hpp"
+#include "Outputs/DisplayMetrics.hpp"
+#include "Outputs/ScanTargets/BufferingScanTarget.hpp"
 
 #include "OpenGL.hpp"
 #include "Primitives/TextureTarget.hpp"
 #include "Primitives/Rectangle.hpp"
 
-#include "../../SignalProcessing/FIRFilter.hpp"
+#include "SignalProcessing/FIRFilter.hpp"
 
 #include <array>
 #include <atomic>
diff --git a/Outputs/ScanTarget.hpp b/Outputs/ScanTarget.hpp
index 94d81792d..447d51745 100644
--- a/Outputs/ScanTarget.hpp
+++ b/Outputs/ScanTarget.hpp
@@ -8,10 +8,11 @@
 
 #pragma once
 
+#include "ClockReceiver/TimeTypes.hpp"
+
 #include <array>
 #include <cstddef>
 #include <cstdint>
-#include "../ClockReceiver/TimeTypes.hpp"
 
 namespace Outputs::Display {
 
diff --git a/Outputs/ScanTargets/BufferingScanTarget.hpp b/Outputs/ScanTargets/BufferingScanTarget.hpp
index 2c95a1d76..fe278d8de 100644
--- a/Outputs/ScanTargets/BufferingScanTarget.hpp
+++ b/Outputs/ScanTargets/BufferingScanTarget.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../ScanTarget.hpp"
-#include "../DisplayMetrics.hpp"
+#include "Outputs/ScanTarget.hpp"
+#include "Outputs/DisplayMetrics.hpp"
 
 #include <array>
 #include <atomic>
diff --git a/Outputs/Speaker/Implementation/BufferSource.hpp b/Outputs/Speaker/Implementation/BufferSource.hpp
index e806a7951..8948c23ef 100644
--- a/Outputs/Speaker/Implementation/BufferSource.hpp
+++ b/Outputs/Speaker/Implementation/BufferSource.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
+#include "Outputs/Speaker/Speaker.hpp"
+
 #include <algorithm>
 #include <array>
 #include <cstddef>
 #include <cstdint>
 
-#include "../Speaker.hpp"
-
 namespace Outputs::Speaker {
 
 enum class Action {
diff --git a/Outputs/Speaker/Implementation/LowpassSpeaker.hpp b/Outputs/Speaker/Implementation/LowpassSpeaker.hpp
index 4f658b7bd..2eca849ad 100644
--- a/Outputs/Speaker/Implementation/LowpassSpeaker.hpp
+++ b/Outputs/Speaker/Implementation/LowpassSpeaker.hpp
@@ -9,10 +9,10 @@
 #pragma once
 
 #include "BufferSource.hpp"
-#include "../Speaker.hpp"
-#include "../../../SignalProcessing/FIRFilter.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../Concurrency/AsyncTaskQueue.hpp"
+#include "Outputs/Speaker/Speaker.hpp"
+#include "SignalProcessing/FIRFilter.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
 
 #include <algorithm>
 #include <cassert>
diff --git a/Processors/6502/6502.hpp b/Processors/6502/6502.hpp
index a1b009d86..d1d7d3857 100644
--- a/Processors/6502/6502.hpp
+++ b/Processors/6502/6502.hpp
@@ -13,11 +13,11 @@
 #include <cstdio>
 #include <cstdint>
 
-#include "../6502Esque/6502Esque.hpp"
-#include "../6502Esque/Implementation/LazyFlags.hpp"
-#include "../../Numeric/Carry.hpp"
-#include "../../Numeric/RegisterSizes.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "Processors/6502Esque/6502Esque.hpp"
+#include "Processors/6502Esque/Implementation/LazyFlags.hpp"
+#include "Numeric/Carry.hpp"
+#include "Numeric/RegisterSizes.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 namespace CPU::MOS6502 {
 
diff --git a/Processors/6502/AllRAM/6502AllRAM.cpp b/Processors/6502/AllRAM/6502AllRAM.cpp
index 14e8704f6..2ace9f951 100644
--- a/Processors/6502/AllRAM/6502AllRAM.cpp
+++ b/Processors/6502/AllRAM/6502AllRAM.cpp
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <cstring>
 
-#include "../../../Components/6526/6526.hpp"
+#include "Components/6526/6526.hpp"
 
 //#define BE_NOISY
 using namespace CPU::MOS6502;
diff --git a/Processors/6502/AllRAM/6502AllRAM.hpp b/Processors/6502/AllRAM/6502AllRAM.hpp
index f9df6e9b2..f395ca071 100644
--- a/Processors/6502/AllRAM/6502AllRAM.hpp
+++ b/Processors/6502/AllRAM/6502AllRAM.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../../6502Esque/6502Selector.hpp"
-#include "../../AllRAMProcessor.hpp"
+#include "Processors/6502Esque/6502Selector.hpp"
+#include "Processors/AllRAMProcessor.hpp"
 
 namespace CPU::MOS6502 {
 
diff --git a/Processors/6502/Implementation/6502Storage.cpp b/Processors/6502/Implementation/6502Storage.cpp
index f1a9e8835..648240e22 100644
--- a/Processors/6502/Implementation/6502Storage.cpp
+++ b/Processors/6502/Implementation/6502Storage.cpp
@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //
 
-#include "../6502.hpp"
+#include "Processors/6502/6502.hpp"
 
 #include <cstring>
 
diff --git a/Processors/6502/State/State.hpp b/Processors/6502/State/State.hpp
index b1d230891..3b83e0dfc 100644
--- a/Processors/6502/State/State.hpp
+++ b/Processors/6502/State/State.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../6502.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
+#include "Processors/6502/6502.hpp"
 
 namespace CPU::MOS6502 {
 
diff --git a/Processors/6502Esque/6502Esque.hpp b/Processors/6502Esque/6502Esque.hpp
index 4be211f33..04462e9d8 100644
--- a/Processors/6502Esque/6502Esque.hpp
+++ b/Processors/6502Esque/6502Esque.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 /*
 	This file defines how the CPU-controlled part of a bus looks for the 6502 and
diff --git a/Processors/6502Esque/6502Selector.hpp b/Processors/6502Esque/6502Selector.hpp
index 5c4cfd8e7..d0904d2c5 100644
--- a/Processors/6502Esque/6502Selector.hpp
+++ b/Processors/6502Esque/6502Selector.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "6502Esque.hpp"
-#include "../6502/6502.hpp"
-#include "../65816/65816.hpp"
+#include "Processors/6502/6502.hpp"
+#include "Processors/65816/65816.hpp"
 
 namespace CPU::MOS6502Esque {
 
diff --git a/Processors/6502Esque/Implementation/LazyFlags.hpp b/Processors/6502Esque/Implementation/LazyFlags.hpp
index 743a2e903..a4850aa44 100644
--- a/Processors/6502Esque/Implementation/LazyFlags.hpp
+++ b/Processors/6502Esque/Implementation/LazyFlags.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../6502Esque.hpp"
+#include "Processors/6502Esque/6502Esque.hpp"
 
 namespace CPU::MOS6502Esque {
 
diff --git a/Processors/65816/65816.hpp b/Processors/65816/65816.hpp
index d06b1f6e0..c4ecdfe4b 100644
--- a/Processors/65816/65816.hpp
+++ b/Processors/65816/65816.hpp
@@ -13,10 +13,10 @@
 #include <cstdint>
 #include <vector>
 
-#include "../../Numeric/RegisterSizes.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../6502Esque/6502Esque.hpp"
-#include "../6502Esque/Implementation/LazyFlags.hpp"
+#include "Numeric/RegisterSizes.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Processors/6502Esque/6502Esque.hpp"
+#include "Processors/6502Esque/Implementation/LazyFlags.hpp"
 
 namespace CPU::WDC65816 {
 
diff --git a/Processors/65816/Implementation/65816Base.cpp b/Processors/65816/Implementation/65816Base.cpp
index eeaab17d8..8a313a82f 100644
--- a/Processors/65816/Implementation/65816Base.cpp
+++ b/Processors/65816/Implementation/65816Base.cpp
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Thomas Harte. All rights reserved.
 //
 
-#include "../65816.hpp"
+#include "Processors/65816/65816.hpp"
 
 using namespace CPU::WDC65816;
 
diff --git a/Processors/65816/Implementation/65816Storage.cpp b/Processors/65816/Implementation/65816Storage.cpp
index 0f9eae345..6da7e5bf8 100644
--- a/Processors/65816/Implementation/65816Storage.cpp
+++ b/Processors/65816/Implementation/65816Storage.cpp
@@ -6,7 +6,7 @@
 //  Copyright © 2020 Thomas Harte. All rights reserved.
 //
 
-#include "../65816.hpp"
+#include "Processors/65816/65816.hpp"
 
 #include <cassert>
 #include <functional>
diff --git a/Processors/68000/68000.hpp b/Processors/68000/68000.hpp
index 537173122..0ccc4823c 100644
--- a/Processors/68000/68000.hpp
+++ b/Processors/68000/68000.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../Numeric/RegisterSizes.hpp"
-#include "../../InstructionSets/M68k/RegisterSet.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Numeric/RegisterSizes.hpp"
+#include "InstructionSets/M68k/RegisterSet.hpp"
 
 #include <cassert>
 
diff --git a/Processors/68000/Implementation/68000Implementation.hpp b/Processors/68000/Implementation/68000Implementation.hpp
index 18db92beb..3300a4351 100644
--- a/Processors/68000/Implementation/68000Implementation.hpp
+++ b/Processors/68000/Implementation/68000Implementation.hpp
@@ -11,7 +11,7 @@
 #include <cassert>
 #include <cstdio>
 
-#include "../../../InstructionSets/M68k/ExceptionVectors.hpp"
+#include "InstructionSets/M68k/ExceptionVectors.hpp"
 
 namespace CPU::MC68000 {
 
diff --git a/Processors/68000/Implementation/68000Storage.hpp b/Processors/68000/Implementation/68000Storage.hpp
index c0b2ef353..f1626b8fa 100644
--- a/Processors/68000/Implementation/68000Storage.hpp
+++ b/Processors/68000/Implementation/68000Storage.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../InstructionSets/M68k/Decoder.hpp"
-#include "../../../InstructionSets/M68k/Perform.hpp"
-#include "../../../InstructionSets/M68k/Status.hpp"
+#include "InstructionSets/M68k/Decoder.hpp"
+#include "InstructionSets/M68k/Perform.hpp"
+#include "InstructionSets/M68k/Status.hpp"
 
 #include <limits>
 
diff --git a/Processors/AllRAMProcessor.hpp b/Processors/AllRAMProcessor.hpp
index c59342f15..ccb824b20 100644
--- a/Processors/AllRAMProcessor.hpp
+++ b/Processors/AllRAMProcessor.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
+#include "ClockReceiver/ClockReceiver.hpp"
+
 #include <cstdint>
 #include <set>
 #include <vector>
 
-#include "../ClockReceiver/ClockReceiver.hpp"
-
 namespace CPU {
 
 class AllRAMProcessor {
diff --git a/Processors/Z80/AllRAM/Z80AllRAM.hpp b/Processors/Z80/AllRAM/Z80AllRAM.hpp
index b410403a1..7e4307e33 100644
--- a/Processors/Z80/AllRAM/Z80AllRAM.hpp
+++ b/Processors/Z80/AllRAM/Z80AllRAM.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../Z80.hpp"
-#include "../../AllRAMProcessor.hpp"
+#include "Processors/Z80/Z80.hpp"
+#include "Processors/AllRAMProcessor.hpp"
 
 namespace CPU::Z80 {
 
diff --git a/Processors/Z80/Implementation/PartialMachineCycle.cpp b/Processors/Z80/Implementation/PartialMachineCycle.cpp
index d54a4b009..19ba0e24d 100644
--- a/Processors/Z80/Implementation/PartialMachineCycle.cpp
+++ b/Processors/Z80/Implementation/PartialMachineCycle.cpp
@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //
 
-#include "../Z80.hpp"
+#include "Processors/Z80/Z80.hpp"
 
 using namespace CPU::Z80;
 
diff --git a/Processors/Z80/Implementation/Z80Base.cpp b/Processors/Z80/Implementation/Z80Base.cpp
index 5eae0fef5..aec81d3d3 100644
--- a/Processors/Z80/Implementation/Z80Base.cpp
+++ b/Processors/Z80/Implementation/Z80Base.cpp
@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //
 
-#include "../Z80.hpp"
+#include "Processors/Z80/Z80.hpp"
 
 using namespace CPU::Z80;
 
diff --git a/Processors/Z80/Implementation/Z80Storage.cpp b/Processors/Z80/Implementation/Z80Storage.cpp
index f89d6dd64..7d3785d3e 100644
--- a/Processors/Z80/Implementation/Z80Storage.cpp
+++ b/Processors/Z80/Implementation/Z80Storage.cpp
@@ -6,7 +6,7 @@
 //  Copyright 2017 Thomas Harte. All rights reserved.
 //
 
-#include "../Z80.hpp"
+#include "Processors/Z80/Z80.hpp"
 #include <cstring>
 
 using namespace CPU::Z80;
diff --git a/Processors/Z80/State/State.hpp b/Processors/Z80/State/State.hpp
index 7d034b21a..b5d06e4e8 100644
--- a/Processors/Z80/State/State.hpp
+++ b/Processors/Z80/State/State.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../../../Reflection/Enum.hpp"
-#include "../../../Reflection/Struct.hpp"
-#include "../Z80.hpp"
+#include "Reflection/Enum.hpp"
+#include "Reflection/Struct.hpp"
+#include "Processors/Z80/Z80.hpp"
 
 namespace CPU {
 namespace Z80 {
diff --git a/Processors/Z80/Z80.hpp b/Processors/Z80/Z80.hpp
index 461788d91..a2dea7956 100644
--- a/Processors/Z80/Z80.hpp
+++ b/Processors/Z80/Z80.hpp
@@ -13,9 +13,9 @@
 #include <vector>
 #include <cstdint>
 
-#include "../../Numeric/RegisterSizes.hpp"
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ForceInline.hpp"
+#include "Numeric/RegisterSizes.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ForceInline.hpp"
 
 namespace CPU::Z80 {
 
diff --git a/Storage/Automation/CSL.cpp b/Storage/Automation/CSL.cpp
index acbdf6fcb..03a96bc38 100644
--- a/Storage/Automation/CSL.cpp
+++ b/Storage/Automation/CSL.cpp
@@ -14,7 +14,7 @@
 #include <unordered_map>
 #include <set>
 
-#include "../../Machines/AmstradCPC/Keyboard.hpp"
+#include "Machines/AmstradCPC/Keyboard.hpp"
 
 using namespace Storage::Automation;
 
diff --git a/Storage/Cartridge/Formats/BinaryDump.cpp b/Storage/Cartridge/Formats/BinaryDump.cpp
index 3ccb1b1b3..c030c4817 100644
--- a/Storage/Cartridge/Formats/BinaryDump.cpp
+++ b/Storage/Cartridge/Formats/BinaryDump.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "BinaryDump.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
 using namespace Storage::Cartridge;
 
diff --git a/Storage/Cartridge/Formats/BinaryDump.hpp b/Storage/Cartridge/Formats/BinaryDump.hpp
index fd35ab88c..1c40f81e9 100644
--- a/Storage/Cartridge/Formats/BinaryDump.hpp
+++ b/Storage/Cartridge/Formats/BinaryDump.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Cartridge.hpp"
+#include "Storage/Cartridge/Cartridge.hpp"
 
 #include <string>
 
diff --git a/Storage/Cartridge/Formats/PRG.cpp b/Storage/Cartridge/Formats/PRG.cpp
index 118df89df..93bc6e1fb 100644
--- a/Storage/Cartridge/Formats/PRG.cpp
+++ b/Storage/Cartridge/Formats/PRG.cpp
@@ -7,12 +7,8 @@
 //
 
 #include "PRG.hpp"
-#include "../../FileHolder.hpp"
-
-#include <cstdio>
-#include <sys/stat.h>
-
-#include "../Encodings/CommodoreROM.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/Cartridge/Encodings/CommodoreROM.hpp"
 
 using namespace Storage::Cartridge;
 
diff --git a/Storage/Cartridge/Formats/PRG.hpp b/Storage/Cartridge/Formats/PRG.hpp
index bf0cc45de..afb130612 100644
--- a/Storage/Cartridge/Formats/PRG.hpp
+++ b/Storage/Cartridge/Formats/PRG.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Cartridge.hpp"
+#include "Storage/Cartridge/Cartridge.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/Controller/DiskController.hpp b/Storage/Disk/Controller/DiskController.hpp
index 2213cd1b0..41330f900 100644
--- a/Storage/Disk/Controller/DiskController.hpp
+++ b/Storage/Disk/Controller/DiskController.hpp
@@ -8,12 +8,12 @@
 
 #pragma once
 
-#include "../Drive.hpp"
-#include "../DPLL/DigitalPhaseLockedLoop.hpp"
-#include "../Track/PCMSegment.hpp"
+#include "Storage/Disk/Drive.hpp"
+#include "Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp"
+#include "Storage/Disk/Track/PCMSegment.hpp"
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/Controller/MFMDiskController.cpp b/Storage/Disk/Controller/MFMDiskController.cpp
index c6d57a8c0..65587ddd2 100644
--- a/Storage/Disk/Controller/MFMDiskController.cpp
+++ b/Storage/Disk/Controller/MFMDiskController.cpp
@@ -8,7 +8,7 @@
 
 #include "MFMDiskController.hpp"
 
-#include "../Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/Controller/MFMDiskController.hpp b/Storage/Disk/Controller/MFMDiskController.hpp
index 7d768987b..0e8347f45 100644
--- a/Storage/Disk/Controller/MFMDiskController.hpp
+++ b/Storage/Disk/Controller/MFMDiskController.hpp
@@ -9,9 +9,9 @@
 #pragma once
 
 #include "DiskController.hpp"
-#include "../../../Numeric/CRC.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../Encodings/MFM/Shifter.hpp"
+#include "Numeric/CRC.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "Storage/Disk/Encodings/MFM/Shifter.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp b/Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp
index ce245e40d..5d9906248 100644
--- a/Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp
+++ b/Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp
@@ -13,7 +13,7 @@
 #include <memory>
 #include <vector>
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 namespace Storage {
 
diff --git a/Storage/Disk/Disk.hpp b/Storage/Disk/Disk.hpp
index ff8d5f805..b63353fb4 100644
--- a/Storage/Disk/Disk.hpp
+++ b/Storage/Disk/Disk.hpp
@@ -13,9 +13,9 @@
 #include <mutex>
 #include <set>
 
-#include "../Storage.hpp"
-#include "Track/Track.hpp"
-#include "../../Concurrency/AsyncTaskQueue.hpp"
+#include "Storage/Storage.hpp"
+#include "Storage/Disk/Track/Track.hpp"
+#include "Concurrency/AsyncTaskQueue.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/DiskImage/DiskImage.hpp b/Storage/Disk/DiskImage/DiskImage.hpp
index e3a181c80..55786d046 100644
--- a/Storage/Disk/DiskImage/DiskImage.hpp
+++ b/Storage/Disk/DiskImage/DiskImage.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
+#include "Storage/Disk/Disk.hpp"
+#include "Storage/Disk/Track/Track.hpp"
+#include "Storage/TargetPlatforms.hpp"
+
 #include <map>
 #include <memory>
 
-#include "../Disk.hpp"
-#include "../Track/Track.hpp"
-#include "../../TargetPlatforms.hpp"
-
 namespace Storage::Disk {
 
 enum class Error {
diff --git a/Storage/Disk/DiskImage/Formats/2MG.cpp b/Storage/Disk/DiskImage/Formats/2MG.cpp
index 676b48c7a..9e0ef523f 100644
--- a/Storage/Disk/DiskImage/Formats/2MG.cpp
+++ b/Storage/Disk/DiskImage/Formats/2MG.cpp
@@ -9,8 +9,7 @@
 #include "2MG.hpp"
 
 #include "MacintoshIMG.hpp"
-#include "../../../MassStorage/Formats/HDV.hpp"
-
+#include "Storage/MassStorage/Formats/HDV.hpp"
 
 #include <cstring>
 
diff --git a/Storage/Disk/DiskImage/Formats/2MG.hpp b/Storage/Disk/DiskImage/Formats/2MG.hpp
index ebd5590d5..59bd97cdf 100644
--- a/Storage/Disk/DiskImage/Formats/2MG.hpp
+++ b/Storage/Disk/DiskImage/Formats/2MG.hpp
@@ -8,10 +8,9 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../MassStorage/MassStorageDevice.hpp"
-
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <cstddef>
 #include <variant>
diff --git a/Storage/Disk/DiskImage/Formats/AcornADF.cpp b/Storage/Disk/DiskImage/Formats/AcornADF.cpp
index 3b5169e1e..01874a2e5 100644
--- a/Storage/Disk/DiskImage/Formats/AcornADF.cpp
+++ b/Storage/Disk/DiskImage/Formats/AcornADF.cpp
@@ -8,7 +8,7 @@
 
 #include "AcornADF.hpp"
 
-#include "Utility/ImplicitSectors.hpp"
+#include "Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp"
 
 #include <cstring>
 
diff --git a/Storage/Disk/DiskImage/Formats/AmigaADF.cpp b/Storage/Disk/DiskImage/Formats/AmigaADF.cpp
index 87bfe13c8..ba87a2689 100644
--- a/Storage/Disk/DiskImage/Formats/AmigaADF.cpp
+++ b/Storage/Disk/DiskImage/Formats/AmigaADF.cpp
@@ -8,10 +8,10 @@
 
 #include "AmigaADF.hpp"
 
-#include "../../Encodings/MFM/Constants.hpp"
-#include "../../Encodings/MFM/Encoder.hpp"
-#include "../../../../Numeric/BitSpread.hpp"
-#include "../../Track/PCMTrack.hpp"
+#include "Numeric/BitSpread.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
 
 #include <type_traits>
 
diff --git a/Storage/Disk/DiskImage/Formats/AppleDSK.cpp b/Storage/Disk/DiskImage/Formats/AppleDSK.cpp
index d8e918aad..0fedcb227 100644
--- a/Storage/Disk/DiskImage/Formats/AppleDSK.cpp
+++ b/Storage/Disk/DiskImage/Formats/AppleDSK.cpp
@@ -8,10 +8,10 @@
 
 #include "AppleDSK.hpp"
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Track/TrackSerialiser.hpp"
-#include "../../Encodings/AppleGCR/Encoder.hpp"
-#include "../../Encodings/AppleGCR/SegmentParser.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/Encoder.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"
 
 #include <cstring>
 
diff --git a/Storage/Disk/DiskImage/Formats/AppleDSK.hpp b/Storage/Disk/DiskImage/Formats/AppleDSK.hpp
index 4655c1998..25d28ed94 100644
--- a/Storage/Disk/DiskImage/Formats/AppleDSK.hpp
+++ b/Storage/Disk/DiskImage/Formats/AppleDSK.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/DiskImage/Formats/CPCDSK.cpp b/Storage/Disk/DiskImage/Formats/CPCDSK.cpp
index e2bce92fa..b4e0bb296 100644
--- a/Storage/Disk/DiskImage/Formats/CPCDSK.cpp
+++ b/Storage/Disk/DiskImage/Formats/CPCDSK.cpp
@@ -8,10 +8,10 @@
 
 #include "CPCDSK.hpp"
 
-#include "../../Encodings/MFM/Constants.hpp"
-#include "../../Encodings/MFM/Encoder.hpp"
-#include "../../Encodings/MFM/SegmentParser.hpp"
-#include "../../Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Encodings/MFM/SegmentParser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 
 #include <iostream>
 
diff --git a/Storage/Disk/DiskImage/Formats/CPCDSK.hpp b/Storage/Disk/DiskImage/Formats/CPCDSK.hpp
index 4ff0fc46c..5774894cf 100644
--- a/Storage/Disk/DiskImage/Formats/CPCDSK.hpp
+++ b/Storage/Disk/DiskImage/Formats/CPCDSK.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
-#include "../../Encodings/MFM/Sector.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/Disk/Encodings/MFM/Sector.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 #include <vector>
diff --git a/Storage/Disk/DiskImage/Formats/D64.cpp b/Storage/Disk/DiskImage/Formats/D64.cpp
index 4520cdef9..097aeb990 100644
--- a/Storage/Disk/DiskImage/Formats/D64.cpp
+++ b/Storage/Disk/DiskImage/Formats/D64.cpp
@@ -12,8 +12,8 @@
 #include <cstring>
 #include <sys/stat.h>
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Encodings/CommodoreGCR.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Encodings/CommodoreGCR.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/D64.hpp b/Storage/Disk/DiskImage/Formats/D64.hpp
index 67ac8b14e..0470cace0 100644
--- a/Storage/Disk/DiskImage/Formats/D64.hpp
+++ b/Storage/Disk/DiskImage/Formats/D64.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/DiskImage/Formats/DMK.cpp b/Storage/Disk/DiskImage/Formats/DMK.cpp
index 6ccd8c87d..034f10697 100644
--- a/Storage/Disk/DiskImage/Formats/DMK.cpp
+++ b/Storage/Disk/DiskImage/Formats/DMK.cpp
@@ -8,9 +8,9 @@
 
 #include "DMK.hpp"
 
-#include "../../Encodings/MFM/Constants.hpp"
-#include "../../Encodings/MFM/Encoder.hpp"
-#include "../../Track/PCMTrack.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/DMK.hpp b/Storage/Disk/DiskImage/Formats/DMK.hpp
index 23276abec..7c774186f 100644
--- a/Storage/Disk/DiskImage/Formats/DMK.hpp
+++ b/Storage/Disk/DiskImage/Formats/DMK.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/DiskImage/Formats/FAT12.cpp b/Storage/Disk/DiskImage/Formats/FAT12.cpp
index ced3aaf92..3c5f4ecda 100644
--- a/Storage/Disk/DiskImage/Formats/FAT12.cpp
+++ b/Storage/Disk/DiskImage/Formats/FAT12.cpp
@@ -8,7 +8,7 @@
 
 #include "FAT12.hpp"
 
-#include "Utility/ImplicitSectors.hpp"
+#include "Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/G64.cpp b/Storage/Disk/DiskImage/Formats/G64.cpp
index 901cdafc8..46393a07f 100644
--- a/Storage/Disk/DiskImage/Formats/G64.cpp
+++ b/Storage/Disk/DiskImage/Formats/G64.cpp
@@ -11,8 +11,8 @@
 #include <cstring>
 #include <vector>
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Encodings/CommodoreGCR.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Encodings/CommodoreGCR.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/G64.hpp b/Storage/Disk/DiskImage/Formats/G64.hpp
index 2700995bd..5c404331e 100644
--- a/Storage/Disk/DiskImage/Formats/G64.hpp
+++ b/Storage/Disk/DiskImage/Formats/G64.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/DiskImage/Formats/HFE.cpp b/Storage/Disk/DiskImage/Formats/HFE.cpp
index 7ae4f3884..9d3768c75 100644
--- a/Storage/Disk/DiskImage/Formats/HFE.cpp
+++ b/Storage/Disk/DiskImage/Formats/HFE.cpp
@@ -8,8 +8,8 @@
 
 #include "HFE.hpp"
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/HFE.hpp b/Storage/Disk/DiskImage/Formats/HFE.hpp
index 8b06085f9..554d5790e 100644
--- a/Storage/Disk/DiskImage/Formats/HFE.hpp
+++ b/Storage/Disk/DiskImage/Formats/HFE.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/DiskImage/Formats/IMD.cpp b/Storage/Disk/DiskImage/Formats/IMD.cpp
index e329c9ed5..cde70b5f6 100644
--- a/Storage/Disk/DiskImage/Formats/IMD.cpp
+++ b/Storage/Disk/DiskImage/Formats/IMD.cpp
@@ -8,10 +8,10 @@
 
 #include "IMD.hpp"
 
-#include "../../Encodings/MFM/Constants.hpp"
-#include "../../Encodings/MFM/Encoder.hpp"
-#include "../../Encodings/MFM/SegmentParser.hpp"
-#include "../../Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Encodings/MFM/SegmentParser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 
 #include <algorithm>
 
diff --git a/Storage/Disk/DiskImage/Formats/IMD.hpp b/Storage/Disk/DiskImage/Formats/IMD.hpp
index 574fdd9bd..094040428 100644
--- a/Storage/Disk/DiskImage/Formats/IMD.hpp
+++ b/Storage/Disk/DiskImage/Formats/IMD.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/DiskImage/Formats/IPF.cpp b/Storage/Disk/DiskImage/Formats/IPF.cpp
index f21f0b7b8..3d87fa33e 100644
--- a/Storage/Disk/DiskImage/Formats/IPF.cpp
+++ b/Storage/Disk/DiskImage/Formats/IPF.cpp
@@ -8,7 +8,7 @@
 
 #include "IPF.hpp"
 
-#include "../../Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
 
 #include <cassert>
 
diff --git a/Storage/Disk/DiskImage/Formats/IPF.hpp b/Storage/Disk/DiskImage/Formats/IPF.hpp
index 336e83713..cd2b32516 100644
--- a/Storage/Disk/DiskImage/Formats/IPF.hpp
+++ b/Storage/Disk/DiskImage/Formats/IPF.hpp
@@ -8,10 +8,10 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../Track/PCMTrack.hpp"
-#include "../../../FileHolder.hpp"
-#include "../../../TargetPlatforms.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/TargetPlatforms.hpp"
 
 #include <string>
 #include <map>
diff --git a/Storage/Disk/DiskImage/Formats/MFMSectorDump.cpp b/Storage/Disk/DiskImage/Formats/MFMSectorDump.cpp
index 89bea31bb..11af5291b 100644
--- a/Storage/Disk/DiskImage/Formats/MFMSectorDump.cpp
+++ b/Storage/Disk/DiskImage/Formats/MFMSectorDump.cpp
@@ -8,7 +8,7 @@
 
 #include "MFMSectorDump.hpp"
 
-#include "Utility/ImplicitSectors.hpp"
+#include "Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/MFMSectorDump.hpp b/Storage/Disk/DiskImage/Formats/MFMSectorDump.hpp
index 479df04a4..c39a66718 100644
--- a/Storage/Disk/DiskImage/Formats/MFMSectorDump.hpp
+++ b/Storage/Disk/DiskImage/Formats/MFMSectorDump.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
-#include "../../Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/DiskImage/Formats/MSA.cpp b/Storage/Disk/DiskImage/Formats/MSA.cpp
index ee401baa2..1f33e589f 100644
--- a/Storage/Disk/DiskImage/Formats/MSA.cpp
+++ b/Storage/Disk/DiskImage/Formats/MSA.cpp
@@ -8,7 +8,7 @@
 
 #include "MSA.hpp"
 
-#include "Utility/ImplicitSectors.hpp"
+#include "Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp"
 
 #include <cassert>
 
diff --git a/Storage/Disk/DiskImage/Formats/MSA.hpp b/Storage/Disk/DiskImage/Formats/MSA.hpp
index c470397b0..1a5df939c 100644
--- a/Storage/Disk/DiskImage/Formats/MSA.hpp
+++ b/Storage/Disk/DiskImage/Formats/MSA.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <vector>
 
diff --git a/Storage/Disk/DiskImage/Formats/MacintoshIMG.cpp b/Storage/Disk/DiskImage/Formats/MacintoshIMG.cpp
index 87b00f368..df792245c 100644
--- a/Storage/Disk/DiskImage/Formats/MacintoshIMG.cpp
+++ b/Storage/Disk/DiskImage/Formats/MacintoshIMG.cpp
@@ -10,10 +10,10 @@
 
 #include <cstring>
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Track/TrackSerialiser.hpp"
-#include "../../Encodings/AppleGCR/Encoder.hpp"
-#include "../../Encodings/AppleGCR/SegmentParser.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/Encoder.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"
 
 /*
 	File format specifications as referenced below are largely
diff --git a/Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp b/Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp
index c26a87853..d518bf16a 100644
--- a/Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp
+++ b/Storage/Disk/DiskImage/Formats/MacintoshIMG.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/DiskImage/Formats/NIB.cpp b/Storage/Disk/DiskImage/Formats/NIB.cpp
index a061ec087..814a9e0f5 100644
--- a/Storage/Disk/DiskImage/Formats/NIB.cpp
+++ b/Storage/Disk/DiskImage/Formats/NIB.cpp
@@ -8,12 +8,10 @@
 
 #include "NIB.hpp"
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Track/TrackSerialiser.hpp"
-#include "../../Encodings/AppleGCR/Encoder.hpp"
-
-#include "../../Encodings/AppleGCR/Encoder.hpp"
-#include "../../Encodings/AppleGCR/SegmentParser.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/Encoder.hpp"
+#include "Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp"
 
 #include <vector>
 
diff --git a/Storage/Disk/DiskImage/Formats/NIB.hpp b/Storage/Disk/DiskImage/Formats/NIB.hpp
index 9e9119746..41b2bd0fb 100644
--- a/Storage/Disk/DiskImage/Formats/NIB.hpp
+++ b/Storage/Disk/DiskImage/Formats/NIB.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
-#include "../../Track/PCMTrack.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <memory>
 
diff --git a/Storage/Disk/DiskImage/Formats/OricMFMDSK.cpp b/Storage/Disk/DiskImage/Formats/OricMFMDSK.cpp
index 05c98e48f..559c46119 100644
--- a/Storage/Disk/DiskImage/Formats/OricMFMDSK.cpp
+++ b/Storage/Disk/DiskImage/Formats/OricMFMDSK.cpp
@@ -8,11 +8,11 @@
 
 #include "OricMFMDSK.hpp"
 
-#include "../../Encodings/MFM/Constants.hpp"
-#include "../../Encodings/MFM/Shifter.hpp"
-#include "../../Encodings/MFM/Encoder.hpp"
-#include "../../Track/PCMTrack.hpp"
-#include "../../Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Shifter.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp b/Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp
index a43d9f606..482e11110 100644
--- a/Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp
+++ b/Storage/Disk/DiskImage/Formats/OricMFMDSK.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/DiskImage/Formats/PCBooter.cpp b/Storage/Disk/DiskImage/Formats/PCBooter.cpp
index 9a2360dcc..a3bc8d01c 100644
--- a/Storage/Disk/DiskImage/Formats/PCBooter.cpp
+++ b/Storage/Disk/DiskImage/Formats/PCBooter.cpp
@@ -8,7 +8,7 @@
 
 #include "PCBooter.hpp"
 
-#include "Utility/ImplicitSectors.hpp"
+#include "Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp"
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/STX.cpp b/Storage/Disk/DiskImage/Formats/STX.cpp
index 78653c972..fa02f23cb 100644
--- a/Storage/Disk/DiskImage/Formats/STX.cpp
+++ b/Storage/Disk/DiskImage/Formats/STX.cpp
@@ -8,12 +8,12 @@
 
 #include "STX.hpp"
 
-#include "../../Encodings/MFM/Constants.hpp"
-#include "../../Encodings/MFM/Shifter.hpp"
-#include "../../Encodings/MFM/Encoder.hpp"
-#include "../../Track/PCMTrack.hpp"
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Shifter.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
 
-#include "Utility/ImplicitSectors.hpp"
+#include "Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp"
 
 #include <array>
 #include <cstdlib>
diff --git a/Storage/Disk/DiskImage/Formats/STX.hpp b/Storage/Disk/DiskImage/Formats/STX.hpp
index e9860bfc3..6f9b5489d 100644
--- a/Storage/Disk/DiskImage/Formats/STX.hpp
+++ b/Storage/Disk/DiskImage/Formats/STX.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
 
 namespace Storage::Disk {
 
diff --git a/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp b/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
index 9398f4598..cf090f3cf 100644
--- a/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
+++ b/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.cpp
@@ -8,13 +8,13 @@
 
 #include "ImplicitSectors.hpp"
 
-#include <cstring>
+#include "Storage/Disk/Encodings/MFM/Constants.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+#include "Storage/Disk/Encodings/MFM/Sector.hpp"
+#include "Storage/Disk/Encodings/MFM/SegmentParser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 
-#include "../../../Encodings/MFM/Sector.hpp"
-#include "../../../Encodings/MFM/Encoder.hpp"
-#include "../../../Encodings/MFM/Constants.hpp"
-#include "../../../Track/TrackSerialiser.hpp"
-#include "../../../Encodings/MFM/SegmentParser.hpp"
+#include <cstring>
 
 using namespace Storage::Disk;
 
diff --git a/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp b/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp
index 246ed480d..ae9afc832 100644
--- a/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp
+++ b/Storage/Disk/DiskImage/Formats/Utility/ImplicitSectors.hpp
@@ -8,13 +8,12 @@
 
 #pragma once
 
-#include "../../../Track/Track.hpp"
+#include "Storage/Disk/Track/Track.hpp"
+#include "Storage/Disk/Encodings/MFM/Encoder.hpp"
+
 #include <memory>
 #include <vector>
 
-#include "../../../Encodings/MFM/Encoder.hpp"
-
-
 namespace Storage::Disk {
 
 std::unique_ptr<Track> track_for_sectors(
diff --git a/Storage/Disk/DiskImage/Formats/WOZ.cpp b/Storage/Disk/DiskImage/Formats/WOZ.cpp
index 856ccda33..42c4d89ae 100644
--- a/Storage/Disk/DiskImage/Formats/WOZ.cpp
+++ b/Storage/Disk/DiskImage/Formats/WOZ.cpp
@@ -8,8 +8,8 @@
 
 #include "WOZ.hpp"
 
-#include "../../Track/PCMTrack.hpp"
-#include "../../Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 
 #include <cstring>
 
diff --git a/Storage/Disk/DiskImage/Formats/WOZ.hpp b/Storage/Disk/DiskImage/Formats/WOZ.hpp
index 0c72bdbd9..275ae1413 100644
--- a/Storage/Disk/DiskImage/Formats/WOZ.hpp
+++ b/Storage/Disk/DiskImage/Formats/WOZ.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../DiskImage.hpp"
-#include "../../../FileHolder.hpp"
-#include "../../../../Numeric/CRC.hpp"
+#include "Storage/Disk/DiskImage/DiskImage.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Numeric/CRC.hpp"
 
 #include <string>
 
diff --git a/Storage/Disk/Drive.hpp b/Storage/Disk/Drive.hpp
index f3a28e621..a63fb7627 100644
--- a/Storage/Disk/Drive.hpp
+++ b/Storage/Disk/Drive.hpp
@@ -13,9 +13,9 @@
 #include "Track/PCMTrack.hpp"
 #include "Track/UnformattedTrack.hpp"
 
-#include "../TimedEventLoop.hpp"
-#include "../../Activity/Observer.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "Storage/TimedEventLoop.hpp"
+#include "Activity/Observer.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
 #include <memory>
 
diff --git a/Storage/Disk/Encodings/AppleGCR/Encoder.hpp b/Storage/Disk/Encodings/AppleGCR/Encoder.hpp
index 3106f6904..50f37c827 100644
--- a/Storage/Disk/Encodings/AppleGCR/Encoder.hpp
+++ b/Storage/Disk/Encodings/AppleGCR/Encoder.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
+#include "Storage/Disk/Track/PCMSegment.hpp"
 #include <cstdint>
-#include "../../../Disk/Track/PCMSegment.hpp"
 
 namespace Storage::Encodings::AppleGCR {
 
diff --git a/Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp b/Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp
index 2f2a2bd0b..78abb71a4 100644
--- a/Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp
+++ b/Storage/Disk/Encodings/AppleGCR/SegmentParser.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "Sector.hpp"
-#include "../../Track/PCMSegment.hpp"
+#include "Storage/Disk/Track/PCMSegment.hpp"
 #include <map>
 
 namespace Storage::Encodings::AppleGCR {
diff --git a/Storage/Disk/Encodings/CommodoreGCR.hpp b/Storage/Disk/Encodings/CommodoreGCR.hpp
index 3e16077ed..ecbecce22 100644
--- a/Storage/Disk/Encodings/CommodoreGCR.hpp
+++ b/Storage/Disk/Encodings/CommodoreGCR.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Storage.hpp"
+#include "Storage/Storage.hpp"
 #include <cstdint>
 
 namespace Storage::Encodings {
diff --git a/Storage/Disk/Encodings/MFM/Constants.hpp b/Storage/Disk/Encodings/MFM/Constants.hpp
index 9e8f1c64f..923bd430a 100644
--- a/Storage/Disk/Encodings/MFM/Constants.hpp
+++ b/Storage/Disk/Encodings/MFM/Constants.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../../Storage.hpp"
+#include "Storage/Storage.hpp"
 
 namespace Storage::Encodings::MFM {
 
diff --git a/Storage/Disk/Encodings/MFM/Encoder.cpp b/Storage/Disk/Encodings/MFM/Encoder.cpp
index 8166467b4..cf77210d5 100644
--- a/Storage/Disk/Encodings/MFM/Encoder.cpp
+++ b/Storage/Disk/Encodings/MFM/Encoder.cpp
@@ -9,9 +9,9 @@
 #include "Encoder.hpp"
 
 #include "Constants.hpp"
-#include "../../Track/PCMTrack.hpp"
-#include "../../../../Numeric/CRC.hpp"
-#include "../../../../Numeric/BitSpread.hpp"
+#include "Storage/Disk/Track/PCMTrack.hpp"
+#include "Numeric/CRC.hpp"
+#include "Numeric/BitSpread.hpp"
 
 #include <cassert>
 #include <set>
diff --git a/Storage/Disk/Encodings/MFM/Encoder.hpp b/Storage/Disk/Encodings/MFM/Encoder.hpp
index 521cfe95e..416a7596a 100644
--- a/Storage/Disk/Encodings/MFM/Encoder.hpp
+++ b/Storage/Disk/Encodings/MFM/Encoder.hpp
@@ -15,8 +15,8 @@
 
 #include "Constants.hpp"
 #include "Sector.hpp"
-#include "../../Track/Track.hpp"
-#include "../../../../Numeric/CRC.hpp"
+#include "Storage/Disk/Track/Track.hpp"
+#include "Numeric/CRC.hpp"
 
 namespace Storage::Encodings::MFM {
 
diff --git a/Storage/Disk/Encodings/MFM/Parser.cpp b/Storage/Disk/Encodings/MFM/Parser.cpp
index a0880e811..8e19550b4 100644
--- a/Storage/Disk/Encodings/MFM/Parser.cpp
+++ b/Storage/Disk/Encodings/MFM/Parser.cpp
@@ -9,7 +9,7 @@
 #include "Parser.hpp"
 
 #include "Constants.hpp"
-#include "../../Track/TrackSerialiser.hpp"
+#include "Storage/Disk/Track/TrackSerialiser.hpp"
 #include "SegmentParser.hpp"
 
 using namespace Storage::Encodings::MFM;
diff --git a/Storage/Disk/Encodings/MFM/Parser.hpp b/Storage/Disk/Encodings/MFM/Parser.hpp
index a528d81c2..87ade0973 100644
--- a/Storage/Disk/Encodings/MFM/Parser.hpp
+++ b/Storage/Disk/Encodings/MFM/Parser.hpp
@@ -11,8 +11,8 @@
 #include "Constants.hpp"
 #include "Sector.hpp"
 #include "SegmentParser.hpp"
-#include "../../Track/Track.hpp"
-#include "../../Drive.hpp"
+#include "Storage/Disk/Track/Track.hpp"
+#include "Storage/Disk/Drive.hpp"
 
 #include <optional>
 
diff --git a/Storage/Disk/Encodings/MFM/SegmentParser.hpp b/Storage/Disk/Encodings/MFM/SegmentParser.hpp
index 45b96b6a7..da1356407 100644
--- a/Storage/Disk/Encodings/MFM/SegmentParser.hpp
+++ b/Storage/Disk/Encodings/MFM/SegmentParser.hpp
@@ -10,7 +10,7 @@
 
 #include "Constants.hpp"
 #include "Sector.hpp"
-#include "../../Track/PCMSegment.hpp"
+#include "Storage/Disk/Track/PCMSegment.hpp"
 #include <map>
 
 namespace Storage::Encodings::MFM {
diff --git a/Storage/Disk/Encodings/MFM/Shifter.cpp b/Storage/Disk/Encodings/MFM/Shifter.cpp
index ba468c606..0fe9f0636 100644
--- a/Storage/Disk/Encodings/MFM/Shifter.cpp
+++ b/Storage/Disk/Encodings/MFM/Shifter.cpp
@@ -9,7 +9,7 @@
 #include "Shifter.hpp"
 #include "Constants.hpp"
 
-#include "../../../../Numeric/BitSpread.hpp"
+#include "Numeric/BitSpread.hpp"
 
 using namespace Storage::Encodings::MFM;
 
diff --git a/Storage/Disk/Encodings/MFM/Shifter.hpp b/Storage/Disk/Encodings/MFM/Shifter.hpp
index f24fcc970..637de8b6f 100644
--- a/Storage/Disk/Encodings/MFM/Shifter.hpp
+++ b/Storage/Disk/Encodings/MFM/Shifter.hpp
@@ -10,7 +10,7 @@
 
 #include <cstdint>
 #include <memory>
-#include "../../../../Numeric/CRC.hpp"
+#include "Numeric/CRC.hpp"
 
 namespace Storage::Encodings::MFM {
 
diff --git a/Storage/Disk/Parsers/CPM.cpp b/Storage/Disk/Parsers/CPM.cpp
index c9b03f028..bd0b3c540 100644
--- a/Storage/Disk/Parsers/CPM.cpp
+++ b/Storage/Disk/Parsers/CPM.cpp
@@ -11,7 +11,7 @@
 #include <algorithm>
 #include <cstring>
 
-#include "../Encodings/MFM/Parser.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
 
 using namespace Storage::Disk::CPM;
 
diff --git a/Storage/Disk/Parsers/CPM.hpp b/Storage/Disk/Parsers/CPM.hpp
index 60529a7bb..8edf3b0c0 100644
--- a/Storage/Disk/Parsers/CPM.hpp
+++ b/Storage/Disk/Parsers/CPM.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Disk.hpp"
+#include "Storage/Disk//Disk.hpp"
 
 #include <cstdint>
 #include <memory>
diff --git a/Storage/Disk/Parsers/FAT.cpp b/Storage/Disk/Parsers/FAT.cpp
index d534a5139..2807f042a 100644
--- a/Storage/Disk/Parsers/FAT.cpp
+++ b/Storage/Disk/Parsers/FAT.cpp
@@ -8,7 +8,7 @@
 
 #include "FAT.hpp"
 
-#include "../Encodings/MFM/Parser.hpp"
+#include "Storage/Disk/Encodings/MFM/Parser.hpp"
 
 #include <iostream>
 
diff --git a/Storage/Disk/Parsers/FAT.hpp b/Storage/Disk/Parsers/FAT.hpp
index e7a4df4b7..935eb33a5 100644
--- a/Storage/Disk/Parsers/FAT.hpp
+++ b/Storage/Disk/Parsers/FAT.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Disk.hpp"
+#include "Storage/Disk/Disk.hpp"
 
 #include <cstdint>
 #include <optional>
diff --git a/Storage/Disk/Track/PCMSegment.hpp b/Storage/Disk/Track/PCMSegment.hpp
index e9b4d8e60..30660821f 100644
--- a/Storage/Disk/Track/PCMSegment.hpp
+++ b/Storage/Disk/Track/PCMSegment.hpp
@@ -12,8 +12,8 @@
 #include <memory>
 #include <vector>
 
-#include "../../Storage.hpp"
-#include "../../../Numeric/LFSR.hpp"
+#include "Storage/Storage.hpp"
+#include "Numeric/LFSR.hpp"
 #include "Track.hpp"
 
 namespace Storage::Disk {
diff --git a/Storage/Disk/Track/PCMTrack.hpp b/Storage/Disk/Track/PCMTrack.hpp
index ffb3672e0..d9ab0f8de 100644
--- a/Storage/Disk/Track/PCMTrack.hpp
+++ b/Storage/Disk/Track/PCMTrack.hpp
@@ -10,7 +10,7 @@
 
 #include "Track.hpp"
 #include "PCMSegment.hpp"
-#include "../../../ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
 
 #include <vector>
 
diff --git a/Storage/Disk/Track/Track.hpp b/Storage/Disk/Track/Track.hpp
index 2c032c5bd..27b51049d 100644
--- a/Storage/Disk/Track/Track.hpp
+++ b/Storage/Disk/Track/Track.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Storage.hpp"
+#include "Storage/Storage.hpp"
 #include <tuple>
 
 namespace Storage::Disk {
diff --git a/Storage/Disk/Track/TrackSerialiser.hpp b/Storage/Disk/Track/TrackSerialiser.hpp
index 4135a5d91..c51b79962 100644
--- a/Storage/Disk/Track/TrackSerialiser.hpp
+++ b/Storage/Disk/Track/TrackSerialiser.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../DPLL/DigitalPhaseLockedLoop.hpp"
+#include "Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp"
 #include "PCMSegment.hpp"
 #include "Track.hpp"
 
diff --git a/Storage/FileHolder.hpp b/Storage/FileHolder.hpp
index 883305f1e..3647e3e55 100644
--- a/Storage/FileHolder.hpp
+++ b/Storage/FileHolder.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../Numeric/BitStream.hpp"
+#include "Numeric/BitStream.hpp"
 #include <sys/stat.h>
 #include <array>
 #include <cstdio>
diff --git a/Storage/MassStorage/Formats/HDV.hpp b/Storage/MassStorage/Formats/HDV.hpp
index 99499420d..6fb8afe41 100644
--- a/Storage/MassStorage/Formats/HDV.hpp
+++ b/Storage/MassStorage/Formats/HDV.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../MassStorageDevice.hpp"
-#include "../../FileHolder.hpp"
-#include "../Encodings/AppleIIVolume.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/MassStorage/Encodings/AppleIIVolume.hpp"
 
 #include <limits>
 #include <vector>
diff --git a/Storage/MassStorage/Formats/HFV.hpp b/Storage/MassStorage/Formats/HFV.hpp
index af68879ad..37b219f9d 100644
--- a/Storage/MassStorage/Formats/HFV.hpp
+++ b/Storage/MassStorage/Formats/HFV.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../MassStorageDevice.hpp"
-#include "../../FileHolder.hpp"
-#include "../Encodings/MacintoshVolume.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/MassStorage/Encodings/MacintoshVolume.hpp"
 
 #include <vector>
 #include <map>
diff --git a/Storage/MassStorage/Formats/RawSectorDump.hpp b/Storage/MassStorage/Formats/RawSectorDump.hpp
index a9f5bf129..bb39a8774 100644
--- a/Storage/MassStorage/Formats/RawSectorDump.hpp
+++ b/Storage/MassStorage/Formats/RawSectorDump.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../MassStorageDevice.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <cassert>
 
diff --git a/Storage/MassStorage/SCSI/DirectAccessDevice.hpp b/Storage/MassStorage/SCSI/DirectAccessDevice.hpp
index cad7b93a5..024f0594f 100644
--- a/Storage/MassStorage/SCSI/DirectAccessDevice.hpp
+++ b/Storage/MassStorage/SCSI/DirectAccessDevice.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "Target.hpp"
-#include "../MassStorageDevice.hpp"
+#include "Storage/MassStorage/MassStorageDevice.hpp"
 
 #include <memory>
 
diff --git a/Storage/MassStorage/SCSI/SCSI.hpp b/Storage/MassStorage/SCSI/SCSI.hpp
index f69efb363..d8b199b57 100644
--- a/Storage/MassStorage/SCSI/SCSI.hpp
+++ b/Storage/MassStorage/SCSI/SCSI.hpp
@@ -12,9 +12,9 @@
 #include <limits>
 #include <vector>
 
-#include "../../../ClockReceiver/ClockReceiver.hpp"
-#include "../../../ClockReceiver/ClockingHintSource.hpp"
-#include "../../../Activity/Source.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
+#include "Activity/Source.hpp"
 
 namespace SCSI {
 
diff --git a/Storage/State/SNA.cpp b/Storage/State/SNA.cpp
index cef5015f9..b46c2d3c2 100644
--- a/Storage/State/SNA.cpp
+++ b/Storage/State/SNA.cpp
@@ -8,10 +8,10 @@
 
 #include "SNA.hpp"
 
-#include "../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
-#include "../../Analyser/Static/ZXSpectrum/Target.hpp"
-#include "../../Machines/Sinclair/ZXSpectrum/State.hpp"
+#include "Analyser/Static/ZXSpectrum/Target.hpp"
+#include "Machines/Sinclair/ZXSpectrum/State.hpp"
 
 using namespace Storage::State;
 
diff --git a/Storage/State/SNA.hpp b/Storage/State/SNA.hpp
index e147759a0..368062d3c 100644
--- a/Storage/State/SNA.hpp
+++ b/Storage/State/SNA.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
 
 namespace Storage::State {
 
diff --git a/Storage/State/SZX.hpp b/Storage/State/SZX.hpp
index 9a974765f..5b16ac156 100644
--- a/Storage/State/SZX.hpp
+++ b/Storage/State/SZX.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
 
 namespace Storage::State {
 
diff --git a/Storage/State/Z80.cpp b/Storage/State/Z80.cpp
index 6c0744c4f..bf94b1391 100644
--- a/Storage/State/Z80.cpp
+++ b/Storage/State/Z80.cpp
@@ -8,10 +8,10 @@
 
 #include "Z80.hpp"
 
-#include "../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
-#include "../../Analyser/Static/ZXSpectrum/Target.hpp"
-#include "../../Machines/Sinclair/ZXSpectrum/State.hpp"
+#include "Analyser/Static/ZXSpectrum/Target.hpp"
+#include "Machines/Sinclair/ZXSpectrum/State.hpp"
 
 using namespace Storage::State;
 
diff --git a/Storage/State/Z80.hpp b/Storage/State/Z80.hpp
index a79bd57e4..408f60f0e 100644
--- a/Storage/State/Z80.hpp
+++ b/Storage/State/Z80.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "../../Analyser/Static/StaticAnalyser.hpp"
+#include "Analyser/Static/StaticAnalyser.hpp"
 
 namespace Storage::State {
 
diff --git a/Storage/Tape/Formats/CAS.hpp b/Storage/Tape/Formats/CAS.hpp
index 3d9a78538..cf096ee23 100644
--- a/Storage/Tape/Formats/CAS.hpp
+++ b/Storage/Tape/Formats/CAS.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "Storage/Tape/Tape.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/Storage/Tape/Formats/CSW.cpp b/Storage/Tape/Formats/CSW.cpp
index 1ff55188f..085903079 100644
--- a/Storage/Tape/Formats/CSW.cpp
+++ b/Storage/Tape/Formats/CSW.cpp
@@ -8,7 +8,7 @@
 
 #include "CSW.hpp"
 
-#include "../../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <cassert>
 
diff --git a/Storage/Tape/Formats/CommodoreTAP.hpp b/Storage/Tape/Formats/CommodoreTAP.hpp
index 4abef0dd6..0a2fdfefb 100644
--- a/Storage/Tape/Formats/CommodoreTAP.hpp
+++ b/Storage/Tape/Formats/CommodoreTAP.hpp
@@ -9,9 +9,9 @@
 #pragma once
 
 #include "Storage/Tape/Tape.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
-#include "../../TargetPlatforms.hpp"
+#include "Storage/TargetPlatforms.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/Storage/Tape/Formats/OricTAP.hpp b/Storage/Tape/Formats/OricTAP.hpp
index 0c3e79ba9..c83ae8f58 100644
--- a/Storage/Tape/Formats/OricTAP.hpp
+++ b/Storage/Tape/Formats/OricTAP.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "Storage/Tape/Tape.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/Storage/Tape/Formats/TZX.hpp b/Storage/Tape/Formats/TZX.hpp
index 06d0b48c0..6cb5747c0 100644
--- a/Storage/Tape/Formats/TZX.hpp
+++ b/Storage/Tape/Formats/TZX.hpp
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "../PulseQueuedTape.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/Tape/PulseQueuedTape.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <string>
 
diff --git a/Storage/Tape/Formats/TapePRG.hpp b/Storage/Tape/Formats/TapePRG.hpp
index 5c0702635..c71f54e2e 100644
--- a/Storage/Tape/Formats/TapePRG.hpp
+++ b/Storage/Tape/Formats/TapePRG.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "Storage/Tape/Tape.hpp"
-#include "../../FileHolder.hpp"
-#include "../../TargetPlatforms.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/TargetPlatforms.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/Storage/Tape/Formats/TapeUEF.hpp b/Storage/Tape/Formats/TapeUEF.hpp
index 802196cc5..61502f8ed 100644
--- a/Storage/Tape/Formats/TapeUEF.hpp
+++ b/Storage/Tape/Formats/TapeUEF.hpp
@@ -8,9 +8,9 @@
 
 #pragma once
 
-#include "../PulseQueuedTape.hpp"
+#include "Storage/Tape/PulseQueuedTape.hpp"
 
-#include "../../TargetPlatforms.hpp"
+#include "Storage/TargetPlatforms.hpp"
 
 #include <cstdint>
 #include <optional>
diff --git a/Storage/Tape/Formats/ZX80O81P.cpp b/Storage/Tape/Formats/ZX80O81P.cpp
index 269f74edc..bd15886a7 100644
--- a/Storage/Tape/Formats/ZX80O81P.cpp
+++ b/Storage/Tape/Formats/ZX80O81P.cpp
@@ -7,7 +7,7 @@
 //
 
 #include "ZX80O81P.hpp"
-#include "../../Data/ZX8081.hpp"
+#include "Storage/Data/ZX8081.hpp"
 
 using namespace Storage::Tape;
 
diff --git a/Storage/Tape/Formats/ZX80O81P.hpp b/Storage/Tape/Formats/ZX80O81P.hpp
index 1171c48ac..8ecf588f2 100644
--- a/Storage/Tape/Formats/ZX80O81P.hpp
+++ b/Storage/Tape/Formats/ZX80O81P.hpp
@@ -10,8 +10,8 @@
 
 #include "Storage/Tape/Tape.hpp"
 
-#include "../../FileHolder.hpp"
-#include "../../TargetPlatforms.hpp"
+#include "Storage/FileHolder.hpp"
+#include "Storage/TargetPlatforms.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/Storage/Tape/Formats/ZXSpectrumTAP.hpp b/Storage/Tape/Formats/ZXSpectrumTAP.hpp
index 9dd05a518..cc2e48977 100644
--- a/Storage/Tape/Formats/ZXSpectrumTAP.hpp
+++ b/Storage/Tape/Formats/ZXSpectrumTAP.hpp
@@ -9,7 +9,7 @@
 #pragma once
 
 #include "Storage/Tape/Tape.hpp"
-#include "../../FileHolder.hpp"
+#include "Storage/FileHolder.hpp"
 
 #include <cstdint>
 #include <string>
diff --git a/Storage/Tape/Parsers/Acorn.hpp b/Storage/Tape/Parsers/Acorn.hpp
index 0d731ca51..91a8d4a6d 100644
--- a/Storage/Tape/Parsers/Acorn.hpp
+++ b/Storage/Tape/Parsers/Acorn.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "TapeParser.hpp"
-#include "../../../Numeric/CRC.hpp"
-#include "../../Disk/DPLL/DigitalPhaseLockedLoop.hpp"
+#include "Numeric/CRC.hpp"
+#include "Storage/Disk/DPLL/DigitalPhaseLockedLoop.hpp"
 
 namespace Storage::Tape::Acorn {
 
diff --git a/Storage/Tape/Parsers/Commodore.cpp b/Storage/Tape/Parsers/Commodore.cpp
index eed63b809..a16579f0a 100644
--- a/Storage/Tape/Parsers/Commodore.cpp
+++ b/Storage/Tape/Parsers/Commodore.cpp
@@ -9,7 +9,7 @@
 #include "Commodore.hpp"
 
 #include <cstring>
-#include "../../Data/Commodore.hpp"
+#include "Storage/Data/Commodore.hpp"
 
 using namespace Storage::Tape::Commodore;
 
diff --git a/Storage/Tape/Parsers/Spectrum.cpp b/Storage/Tape/Parsers/Spectrum.cpp
index 3327136d5..89fea1ca9 100644
--- a/Storage/Tape/Parsers/Spectrum.cpp
+++ b/Storage/Tape/Parsers/Spectrum.cpp
@@ -8,7 +8,7 @@
 
 #include "Spectrum.hpp"
 
-#include "../../../Numeric/BitReverse.hpp"
+#include "Numeric/BitReverse.hpp"
 
 #include <cstring>
 
diff --git a/Storage/Tape/Tape.hpp b/Storage/Tape/Tape.hpp
index ca38a3f62..4b60b0e03 100644
--- a/Storage/Tape/Tape.hpp
+++ b/Storage/Tape/Tape.hpp
@@ -8,13 +8,13 @@
 
 #pragma once
 
-#include "../../ClockReceiver/ClockReceiver.hpp"
-#include "../../ClockReceiver/ClockingHintSource.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "ClockReceiver/ClockingHintSource.hpp"
 
-#include "../TimedEventLoop.hpp"
+#include "Storage/TimedEventLoop.hpp"
 
-#include "../../Activity/Observer.hpp"
-#include "../TargetPlatforms.hpp"
+#include "Activity/Observer.hpp"
+#include "Storage/TargetPlatforms.hpp"
 
 #include <memory>
 
diff --git a/Storage/TimedEventLoop.hpp b/Storage/TimedEventLoop.hpp
index 293b7c64e..9607345d6 100644
--- a/Storage/TimedEventLoop.hpp
+++ b/Storage/TimedEventLoop.hpp
@@ -9,8 +9,8 @@
 #pragma once
 
 #include "Storage.hpp"
-#include "../ClockReceiver/ClockReceiver.hpp"
-#include "../SignalProcessing/Stepper.hpp"
+#include "ClockReceiver/ClockReceiver.hpp"
+#include "SignalProcessing/Stepper.hpp"
 
 #include <memory>