diff --git a/soh/soh/Enhancements/DisableHeatHaze.cpp b/soh/soh/Enhancements/Graphics/DisableHeatHaze.cpp
similarity index 100%
rename from soh/soh/Enhancements/DisableHeatHaze.cpp
rename to soh/soh/Enhancements/Graphics/DisableHeatHaze.cpp
diff --git a/soh/soh/Enhancements/DisableJabuWobble.cpp b/soh/soh/Enhancements/Graphics/DisableJabuWobble.cpp
similarity index 100%
rename from soh/soh/Enhancements/DisableJabuWobble.cpp
rename to soh/soh/Enhancements/Graphics/DisableJabuWobble.cpp
diff --git a/soh/soh/Enhancements/DisableKokiriDrawDistance.cpp b/soh/soh/Enhancements/Graphics/DisableKokiriDrawDistance.cpp
similarity index 100%
rename from soh/soh/Enhancements/DisableKokiriDrawDistance.cpp
rename to soh/soh/Enhancements/Graphics/DisableKokiriDrawDistance.cpp
diff --git a/soh/soh/Enhancements/DisableSandstorm.cpp b/soh/soh/Enhancements/Graphics/DisableSandstorm.cpp
similarity index 100%
rename from soh/soh/Enhancements/DisableSandstorm.cpp
rename to soh/soh/Enhancements/Graphics/DisableSandstorm.cpp
diff --git a/soh/soh/Enhancements/RemoveSpinAttackDarkness.cpp b/soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp
similarity index 100%
rename from soh/soh/Enhancements/RemoveSpinAttackDarkness.cpp
rename to soh/soh/Enhancements/Graphics/RemoveSpinAttackDarkness.cpp
diff --git a/soh/soh/Enhancements/ArrowCycle.cpp b/soh/soh/Enhancements/Items/ArrowCycle.cpp
similarity index 100%
rename from soh/soh/Enhancements/ArrowCycle.cpp
rename to soh/soh/Enhancements/Items/ArrowCycle.cpp
diff --git a/soh/soh/Enhancements/AssignableTunicsAndBoots.cpp b/soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp
similarity index 100%
rename from soh/soh/Enhancements/AssignableTunicsAndBoots.cpp
rename to soh/soh/Enhancements/Items/AssignableTunicsAndBoots.cpp
diff --git a/soh/soh/Enhancements/BlueFireArrows.cpp b/soh/soh/Enhancements/Items/BlueFireArrows.cpp
similarity index 100%
rename from soh/soh/Enhancements/BlueFireArrows.cpp
rename to soh/soh/Enhancements/Items/BlueFireArrows.cpp
diff --git a/soh/soh/Enhancements/InjectItemCounts.cpp b/soh/soh/Enhancements/Items/InjectItemCounts.cpp
similarity index 100%
rename from soh/soh/Enhancements/InjectItemCounts.cpp
rename to soh/soh/Enhancements/Items/InjectItemCounts.cpp
diff --git a/soh/soh/Enhancements/ItemUnequip.cpp b/soh/soh/Enhancements/Items/ItemUnequip.cpp
similarity index 100%
rename from soh/soh/Enhancements/ItemUnequip.cpp
rename to soh/soh/Enhancements/Items/ItemUnequip.cpp
diff --git a/soh/soh/Enhancements/MaskSelect.cpp b/soh/soh/Enhancements/Items/MaskSelect.cpp
similarity index 100%
rename from soh/soh/Enhancements/MaskSelect.cpp
rename to soh/soh/Enhancements/Items/MaskSelect.cpp
diff --git a/soh/soh/Enhancements/RemoteBombchu.cpp b/soh/soh/Enhancements/Items/RemoteBombchu.cpp
similarity index 100%
rename from soh/soh/Enhancements/RemoteBombchu.cpp
rename to soh/soh/Enhancements/Items/RemoteBombchu.cpp
diff --git a/soh/soh/Enhancements/SunlightArrows.cpp b/soh/soh/Enhancements/Items/SunlightArrows.cpp
similarity index 100%
rename from soh/soh/Enhancements/SunlightArrows.cpp
rename to soh/soh/Enhancements/Items/SunlightArrows.cpp
diff --git a/soh/soh/Enhancements/UnsheatheWithoutSlashing.cpp b/soh/soh/Enhancements/Items/UnsheatheWithoutSlashing.cpp
similarity index 100%
rename from soh/soh/Enhancements/UnsheatheWithoutSlashing.cpp
rename to soh/soh/Enhancements/Items/UnsheatheWithoutSlashing.cpp
diff --git a/soh/soh/Enhancements/NoSkulltulaFreeze.cpp b/soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp
similarity index 100%
rename from soh/soh/Enhancements/NoSkulltulaFreeze.cpp
rename to soh/soh/Enhancements/QoL/NoSkulltulaFreeze.cpp
diff --git a/soh/soh/Enhancements/RebottleBlueFire.cpp b/soh/soh/Enhancements/QoL/RebottleBlueFire.cpp
similarity index 100%
rename from soh/soh/Enhancements/RebottleBlueFire.cpp
rename to soh/soh/Enhancements/QoL/RebottleBlueFire.cpp
diff --git a/soh/soh/Enhancements/ResetHotKey.cpp b/soh/soh/Enhancements/QoL/ResetHotKey.cpp
similarity index 100%
rename from soh/soh/Enhancements/ResetHotKey.cpp
rename to soh/soh/Enhancements/QoL/ResetHotKey.cpp
diff --git a/soh/soh/Enhancements/ReworkedTargeting.cpp b/soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
similarity index 100%
rename from soh/soh/Enhancements/ReworkedTargeting.cpp
rename to soh/soh/Enhancements/QoL/ReworkedTargeting.cpp
diff --git a/soh/soh/Enhancements/SkipAmyPuzzle.cpp b/soh/soh/Enhancements/TimeSavers/SkipAmyPuzzle.cpp
similarity index 100%
rename from soh/soh/Enhancements/SkipAmyPuzzle.cpp
rename to soh/soh/Enhancements/TimeSavers/SkipAmyPuzzle.cpp
diff --git a/soh/soh/Enhancements/timesaver_hook_handlers.cpp b/soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp
similarity index 100%
rename from soh/soh/Enhancements/timesaver_hook_handlers.cpp
rename to soh/soh/Enhancements/TimeSavers/timesaver_hook_handlers.cpp