diff --git a/Resolutions/SonicLostWorld_Resolution/rules.txt b/Resolutions/SonicLostWorld_Resolution/rules.txt
deleted file mode 100644
index d511cd44..00000000
--- a/Resolutions/SonicLostWorld_Resolution/rules.txt
+++ /dev/null
@@ -1,218 +0,0 @@
-[Definition]
-titleIds = 0005000010135700,000500001012B100,0005000010128F00
-name = Resolution
-path = "Sonic Lost World/Graphics/Resolution"
-description = Changes the resolution of the game. Made by M&&M.
-version = 4
-
-[Preset]
-name = 1280x720 (Default)
-$width = 1280
-$height = 720
-$gameWidth = 1280
-$gameHeight = 720
-
-# Performance
-
-[Preset]
-name = 320x180
-$width = 320
-$height = 180
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 640x360
-$width = 640
-$height = 360
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 960x540
-$width = 960
-$height = 540
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common HD Resolutions
-
-[Preset]
-name = 1600x900
-$width = 1600
-$height = 900
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1920x1080
-$width = 1920
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1440
-$width = 2560
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3200x1800
-$width = 3200
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3840x2160
-$width = 3840
-$height = 2160
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x2880
-$width = 5120
-$height = 2880
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 7680x4320
-$width = 7680
-$height = 4320
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common Ultrawide Resolutions
-
-[Preset]
-name = 2560x1080 (Ultrawide)
-$width = 2560
-$height = 1080
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3440x1440 (Ultrawide)
-$width = 3440
-$height = 1440
-$gameWidth = 1280
-$gameHeight = 720
-
-# Common 16:10 Resolutions
-
-[Preset]
-name = 1440x900 (16:10)
-$width = 1440
-$height = 900
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1680x1050 (16:10)
-$width = 1680
-$height = 1050
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 1920x1200 (16:10)
-$width = 1920
-$height = 1200
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2560x1600 (16:10)
-$width = 2560
-$height = 1600
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 2880x1800 (16:10)
-$width = 2880
-$height = 1800
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 3840x2400 (16:10)
-$width = 3840
-$height = 2400
-$gameWidth = 1280
-$gameHeight = 720
-
-[Preset]
-name = 5120x3200 (16:10)
-$width = 5120
-$height = 3200
-$gameWidth = 1280
-$gameHeight = 720
-
-[TextureRedefine] # Game Resolution
-width = 1280
-height = 720
-tileModesExcluded = 0x001
-formatsExcluded = 0x032
-overwriteWidth = ($width / $gameWidth) * 1280
-overwriteHeight = ($height / $gameHeight) * 720
-
-[TextureRedefine] # Depth of Field Pass
-width = 640
-height = 368
-overwriteWidth = ($width / $gameWidth) * 640
-overwriteHeight = ($height / $gameHeight) * 368
-
-[TextureRedefine] # Depth of Field Pass
-width = 640
-height = 360
-tileModesExcluded = 0x001
-overwriteWidth = ($width / $gameWidth) * 640
-overwriteHeight = ($height / $gameHeight) * 360
-
-[TextureRedefine] # Depth of Field Pass
-width = 320
-height = 192
-overwriteWidth = ($width / $gameWidth) * 320
-overwriteHeight = ($height / $gameHeight) * 192
-
-[TextureRedefine] # Depth of Field Pass
-width = 320
-height = 180
-tileModesExcluded = 0x001
-overwriteWidth = ($width / $gameWidth) * 320
-overwriteHeight = ($height / $gameHeight) * 180
-
-[TextureRedefine]
-width = 213
-height = 120
-overwriteWidth = ($width / $gameWidth) * 213
-overwriteHeight = ($height / $gameHeight) * 120
-
-[TextureRedefine] # Bloom Pass
-width = 160
-height = 96
-overwriteWidth = ($width / $gameWidth) * 160
-overwriteHeight = ($height / $gameHeight) * 96
-
-[TextureRedefine] # Bloom Pass
-width = 160
-height = 90
-overwriteWidth = ($width / $gameWidth) * 160
-overwriteHeight = ($height / $gameHeight) * 90
-
-[TextureRedefine] # Gamepad Resolution
-width = 864
-height = 480
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
-
-[TextureRedefine] # Gamepad Resolution
-width = 854
-height = 480
-overwriteWidth = ($width / $gameWidth) * 854
-overwriteHeight = ($height / $gameHeight) * 480
diff --git a/Resolutions/SonicLostWorld_Resolution/2fc311c50a4dc0cc_0000000000000000_vs.txt b/src/SonicLostWorld/Graphics/2fc311c50a4dc0cc_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/2fc311c50a4dc0cc_0000000000000000_vs.txt
rename to src/SonicLostWorld/Graphics/2fc311c50a4dc0cc_0000000000000000_vs.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/384f98693cb9e56d_0000000000000000_vs.txt b/src/SonicLostWorld/Graphics/384f98693cb9e56d_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/384f98693cb9e56d_0000000000000000_vs.txt
rename to src/SonicLostWorld/Graphics/384f98693cb9e56d_0000000000000000_vs.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/384f98696d1a276d_0000000000000000_vs.txt b/src/SonicLostWorld/Graphics/384f98696d1a276d_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/384f98696d1a276d_0000000000000000_vs.txt
rename to src/SonicLostWorld/Graphics/384f98696d1a276d_0000000000000000_vs.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/3952c3a52c87c267_0000000000000000_vs.txt b/src/SonicLostWorld/Graphics/3952c3a52c87c267_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/3952c3a52c87c267_0000000000000000_vs.txt
rename to src/SonicLostWorld/Graphics/3952c3a52c87c267_0000000000000000_vs.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/419dbf0ca38aa719_0000000000000000_vs.txt b/src/SonicLostWorld/Graphics/419dbf0ca38aa719_0000000000000000_vs.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/419dbf0ca38aa719_0000000000000000_vs.txt
rename to src/SonicLostWorld/Graphics/419dbf0ca38aa719_0000000000000000_vs.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/58cf1eb8946f4b3c_0000000000000079_ps.txt b/src/SonicLostWorld/Graphics/58cf1eb8946f4b3c_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/58cf1eb8946f4b3c_0000000000000079_ps.txt
rename to src/SonicLostWorld/Graphics/58cf1eb8946f4b3c_0000000000000079_ps.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/79183302695ea935_0000000000000079_ps.txt b/src/SonicLostWorld/Graphics/79183302695ea935_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/79183302695ea935_0000000000000079_ps.txt
rename to src/SonicLostWorld/Graphics/79183302695ea935_0000000000000079_ps.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/92e5b6dffd1d9b9b_0000000000000079_ps.txt b/src/SonicLostWorld/Graphics/92e5b6dffd1d9b9b_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/92e5b6dffd1d9b9b_0000000000000079_ps.txt
rename to src/SonicLostWorld/Graphics/92e5b6dffd1d9b9b_0000000000000079_ps.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/a455fc196032912c_0000000000000079_ps.txt b/src/SonicLostWorld/Graphics/a455fc196032912c_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/a455fc196032912c_0000000000000079_ps.txt
rename to src/SonicLostWorld/Graphics/a455fc196032912c_0000000000000079_ps.txt
diff --git a/Resolutions/SonicLostWorld_Resolution/patches.txt b/src/SonicLostWorld/Graphics/patches.txt
similarity index 100%
rename from Resolutions/SonicLostWorld_Resolution/patches.txt
rename to src/SonicLostWorld/Graphics/patches.txt
diff --git a/src/SonicLostWorld/Graphics/rules.txt b/src/SonicLostWorld/Graphics/rules.txt
new file mode 100644
index 00000000..5aa00cde
--- /dev/null
+++ b/src/SonicLostWorld/Graphics/rules.txt
@@ -0,0 +1,351 @@
+[Definition]
+titleIds = 0005000010135700,000500001012B100,0005000010128F00
+name = Graphic Options
+path = "Sonic Lost World/Graphics"
+description = Allows you to change the game's TV resolution, gamepad resolution and anisotropic filtering quality.||Made by M&&M.
+version = 6
+
+[Default]
+$width = 1280
+$height = 720
+$padWidth = 854
+$padHeight = 480
+$gameWidth = 1280
+$gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+$anisotropy = 1
+
+
+# TV Resolution
+
+[Preset]
+category = TV Resolution
+name = 320x180
+$width = 320
+$height = 180
+
+[Preset]
+category = TV Resolution
+name = 640x360
+$width = 640
+$height = 360
+
+[Preset]
+category = TV Resolution
+name = 854x480
+$width = 854
+$height = 480
+
+[Preset]
+category = TV Resolution
+name = 960x540
+$width = 960
+$height = 540
+
+[Preset]
+category = TV Resolution
+name = 1280x720
+default = 1
+
+[Preset]
+category = TV Resolution
+name = 1600x900
+$width = 1600
+$height = 900
+
+[Preset]
+category = TV Resolution
+name = 1920x1080
+$width = 1920
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 2560x1440
+$width = 2560
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 3200x1800
+$width = 3200
+$height = 1800
+
+[Preset]
+category = TV Resolution
+name = 3840x2160
+$width = 3840
+$height = 2160
+
+[Preset]
+category = TV Resolution
+name = 5120x2880
+$width = 5120
+$height = 2880
+
+[Preset]
+category = TV Resolution
+name = 7680x4320
+$width = 7680
+$height = 4320
+
+[Preset]
+category = TV Resolution
+name = 1680x1050 (16:10)
+$width = 1680
+$height = 1050
+
+[Preset]
+category = TV Resolution
+name = 1920x1200 (16:10)
+$width = 1920
+$height = 1200
+
+[Preset]
+category = TV Resolution
+name = 2560x1080 (21:9)
+$width = 2560
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 3440x1440 (21:9)
+$width = 3440
+$height = 1440
+
+[Preset]
+category = TV Resolution
+name = 5120x2160 (21:9)
+$width = 5120
+$height = 2160
+
+[Preset]
+category = TV Resolution
+name = 3840x1080 (32:9)
+$width = 3840
+$height = 1080
+
+[Preset]
+category = TV Resolution
+name = 5120×1440 (32:9)
+$width = 5120
+$height = 1440
+
+
+# Gamepad Resolution
+
+[Preset]
+category = Gamepad Resolution
+name = 320x180
+$padWidth = 320
+$padHeight = 180
+
+[Preset]
+category = Gamepad Resolution
+name = 640x360
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+category = Gamepad Resolution
+name = 854x480
+default = 1
+
+[Preset]
+category = Gamepad Resolution
+name = 960x540
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+category = Gamepad Resolution
+name = 1280x720
+$padWidth = 1280
+$padHeight = 720
+
+[Preset]
+category = Gamepad Resolution
+name = 1600x900
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1080
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1440
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 3200x1800
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x2160
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2880
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+category = Gamepad Resolution
+name = 7680x4320
+$padWidth = 7680
+$padHeight = 4320
+
+[Preset]
+category = Gamepad Resolution
+name = 1680x1050 (16:10)
+$padWidth = 1680
+$padHeight = 1050
+
+[Preset]
+category = Gamepad Resolution
+name = 1920x1200 (16:10)
+$padWidth = 1920
+$padHeight = 1200
+
+[Preset]
+category = Gamepad Resolution
+name = 2560x1080 (21:9)
+$padWidth = 2560
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 3440x1440 (21:9)
+$padWidth = 3440
+$padHeight = 1440
+
+[Preset]
+category = Gamepad Resolution
+name = 5120x2160 (21:9)
+$padWidth = 5120
+$padHeight = 2160
+
+[Preset]
+category = Gamepad Resolution
+name = 3840x1080 (32:9)
+$padWidth = 3840
+$padHeight = 1080
+
+[Preset]
+category = Gamepad Resolution
+name = 5120×1440 (32:9)
+$padWidth = 5120
+$padHeight = 1440
+
+# Anisotropic Filtering Quality
+
+[Preset]
+name = 1x
+category = Anisotropic Filtering Quality
+default = 1
+
+[Preset]
+name = 2x
+category = Anisotropic Filtering Quality
+$anisotropy = 2
+
+[Preset]
+name = 4x
+category = Anisotropic Filtering Quality
+$anisotropy = 4
+
+[Preset]
+name = 8x
+category = Anisotropic Filtering Quality
+$anisotropy = 8
+
+[Preset]
+name = 16x
+category = Anisotropic Filtering Quality
+$anisotropy = 16
+ 
+
+
+# Anisotropic Filtering
+
+[TextureRedefine]
+tileModesExcluded = 0x1 # ignore cpu processed textures
+formatsExcluded = 0x1,0x19,0x1a,0x1f,0x122,0x806,0x80e,0x816,0x81e,0x820,0x823 # ignore viewports and cubemaps
+overwriteAnisotropy = $anisotropy
+
+# Texture Redefines
+
+[TextureRedefine] # TV Resolution
+width = 1280
+height = 720
+tileModesExcluded = 0x001
+formatsExcluded = 0x032
+overwriteWidth = ($width/$gameWidth) * 1280
+overwriteHeight = ($height/$gameHeight) * 720
+
+[TextureRedefine] # Depth of Field Pass
+width = 640
+height = 368
+overwriteWidth = ($width/$gameWidth) * 640
+overwriteHeight = ($height/$gameHeight) * 368
+
+[TextureRedefine] # Depth of Field Pass
+width = 640
+height = 360
+tileModesExcluded = 0x001
+overwriteWidth = ($width/$gameWidth) * 640
+overwriteHeight = ($height/$gameHeight) * 360
+
+[TextureRedefine] # Depth of Field Pass
+width = 320
+height = 192
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 192
+
+[TextureRedefine] # Depth of Field Pass
+width = 320
+height = 180
+tileModesExcluded = 0x001
+overwriteWidth = ($width/$gameWidth) * 320
+overwriteHeight = ($height/$gameHeight) * 180
+
+[TextureRedefine]
+width = 213
+height = 120
+overwriteWidth = ($width/$gameWidth) * 213
+overwriteHeight = ($height/$gameHeight) * 120
+
+[TextureRedefine] # Bloom Pass
+width = 160
+height = 96
+overwriteWidth = ($width/$gameWidth) * 160
+overwriteHeight = ($height/$gameHeight) * 96
+
+[TextureRedefine] # Bloom Pass
+width = 160
+height = 90
+overwriteWidth = ($width/$gameWidth) * 160
+overwriteHeight = ($height/$gameHeight) * 90
+
+[TextureRedefine] # Gamepad Resolution
+width = 864
+height = 480
+overwriteWidth = ($padWidth/$gamePadWidth) * 864
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
+
+[TextureRedefine] # Gamepad Resolution
+width = 854
+height = 480
+overwriteWidth = ($padWidth/$gamePadWidth) * 854
+overwriteHeight = ($padHeight/$gamePadHeight) * 480
diff --git a/Mods/SonicLostWorld_60FPSMultiplayer/patches.txt b/src/SonicLostWorld/Mods/60FPSMultiplayer/patches.txt
similarity index 100%
rename from Mods/SonicLostWorld_60FPSMultiplayer/patches.txt
rename to src/SonicLostWorld/Mods/60FPSMultiplayer/patches.txt
diff --git a/Mods/SonicLostWorld_60FPSMultiplayer/rules.txt b/src/SonicLostWorld/Mods/60FPSMultiplayer/rules.txt
similarity index 85%
rename from Mods/SonicLostWorld_60FPSMultiplayer/rules.txt
rename to src/SonicLostWorld/Mods/60FPSMultiplayer/rules.txt
index 81de7db6..6d19e4da 100644
--- a/Mods/SonicLostWorld_60FPSMultiplayer/rules.txt
+++ b/src/SonicLostWorld/Mods/60FPSMultiplayer/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = 60FPS Two-Player Race
 path = "Sonic Lost World/Mods/60FPS 2P Race"
-description = Patches out the 30FPS lock from the two-player race mode. Made by M&&M.
-version = 4
+description = Patches out the 30FPS lock from the two-player race mode.||Made by M&&M.
+version = 6
diff --git a/Mods/SonicLostWorld_NoMusic/patches.txt b/src/SonicLostWorld/Mods/NoMusic/patches.txt
similarity index 100%
rename from Mods/SonicLostWorld_NoMusic/patches.txt
rename to src/SonicLostWorld/Mods/NoMusic/patches.txt
diff --git a/Mods/SonicLostWorld_NoMusic/rules.txt b/src/SonicLostWorld/Mods/NoMusic/rules.txt
similarity index 62%
rename from Mods/SonicLostWorld_NoMusic/rules.txt
rename to src/SonicLostWorld/Mods/NoMusic/rules.txt
index 55c6cfb3..8a97d28f 100644
--- a/Mods/SonicLostWorld_NoMusic/rules.txt
+++ b/src/SonicLostWorld/Mods/NoMusic/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = No Music
 path = "Sonic Lost World/Mods/No Music"
-description = Disables the game's music playback.|Made by M&&M.
-version = 4
+description = Disables the game's music playback.||Made by M&&M.
+version = 6
diff --git a/Mods/SonicLostWorld_NoVoices/patches.txt b/src/SonicLostWorld/Mods/NoVoices/patches.txt
similarity index 100%
rename from Mods/SonicLostWorld_NoVoices/patches.txt
rename to src/SonicLostWorld/Mods/NoVoices/patches.txt
diff --git a/Mods/SonicLostWorld_NoVoices/rules.txt b/src/SonicLostWorld/Mods/NoVoices/rules.txt
similarity index 78%
rename from Mods/SonicLostWorld_NoVoices/rules.txt
rename to src/SonicLostWorld/Mods/NoVoices/rules.txt
index 16e2a3ca..537c847e 100644
--- a/Mods/SonicLostWorld_NoVoices/rules.txt
+++ b/src/SonicLostWorld/Mods/NoVoices/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = No Voices
 path = "Sonic Lost World/Mods/No Voices"
-description = Disables the game's voice playback, which are mainly used by the Deadly Six.|Made by M&&M.
-version = 4
+description = Disables the game's voice playback, which are mainly used by the Deadly Six.||Made by M&&M.
+version = 6
diff --git a/Mods/SonicLostWorld_Quickboot/patches.txt b/src/SonicLostWorld/Mods/Quickboot/patches.txt
similarity index 100%
rename from Mods/SonicLostWorld_Quickboot/patches.txt
rename to src/SonicLostWorld/Mods/Quickboot/patches.txt
diff --git a/Mods/SonicLostWorld_Quickboot/rules.txt b/src/SonicLostWorld/Mods/Quickboot/rules.txt
similarity index 74%
rename from Mods/SonicLostWorld_Quickboot/rules.txt
rename to src/SonicLostWorld/Mods/Quickboot/rules.txt
index 3eae913d..35cf88fe 100644
--- a/Mods/SonicLostWorld_Quickboot/rules.txt
+++ b/src/SonicLostWorld/Mods/Quickboot/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = Quickboot
 path = "Sonic Lost World/Mods/Quickboot"
-description = Boot straight to the title screen.|Can be customized by modifying the patch file.|Made by M&&M and Sajid.
-version = 4
+description = Boot straight to the title screen.|Can be customized by modifying the patch file.||Made by M&&M and Sajid.
+version = 6
diff --git a/Mods/SonicLostWorld_Quickboot/stagelist.txt b/src/SonicLostWorld/Mods/Quickboot/stagelist.txt
similarity index 100%
rename from Mods/SonicLostWorld_Quickboot/stagelist.txt
rename to src/SonicLostWorld/Mods/Quickboot/stagelist.txt
diff --git a/Mods/SonicLostWorld_RetryNormalPlay/patches.txt b/src/SonicLostWorld/Mods/RetryNormalPlay/patches.txt
similarity index 100%
rename from Mods/SonicLostWorld_RetryNormalPlay/patches.txt
rename to src/SonicLostWorld/Mods/RetryNormalPlay/patches.txt
diff --git a/Mods/SonicLostWorld_RetryNormalPlay/rules.txt b/src/SonicLostWorld/Mods/RetryNormalPlay/rules.txt
similarity index 62%
rename from Mods/SonicLostWorld_RetryNormalPlay/rules.txt
rename to src/SonicLostWorld/Mods/RetryNormalPlay/rules.txt
index ae64a75a..6d354b86 100644
--- a/Mods/SonicLostWorld_RetryNormalPlay/rules.txt
+++ b/src/SonicLostWorld/Mods/RetryNormalPlay/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = Retry in Normal Play
 path = "Sonic Lost World/Mods/Retry in Normal Play"
-description = Allows you to retry outside of time trials.|Made by M&&M and Sajid.
-version = 4
+description = Allows you to retry outside of time trials.||Made by M&&M and Sajid.
+version = 6
diff --git a/Mods/SonicLostWorld_TimeTrialsEverywhere/patches.txt b/src/SonicLostWorld/Mods/TimeTrialsEverywhere/patches.txt
similarity index 100%
rename from Mods/SonicLostWorld_TimeTrialsEverywhere/patches.txt
rename to src/SonicLostWorld/Mods/TimeTrialsEverywhere/patches.txt
diff --git a/Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt b/src/SonicLostWorld/Mods/TimeTrialsEverywhere/rules.txt
similarity index 85%
rename from Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt
rename to src/SonicLostWorld/Mods/TimeTrialsEverywhere/rules.txt
index 790a4af2..e3d668e0 100644
--- a/Mods/SonicLostWorld_TimeTrialsEverywhere/rules.txt
+++ b/src/SonicLostWorld/Mods/TimeTrialsEverywhere/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = Time Trials Everywhere
 path = "Sonic Lost World/Mods/Time Trials Everywhere"
-description = Allows you to do time trials in every stage except for DLC.|Made by M&&M.
-version = 4
+description = Allows you to do time trials in every stage except for DLC.||Made by M&&M.
+version = 6
diff --git a/Workarounds/SonicLostWorld_DisableLightScattering/patches.txt b/src/SonicLostWorld/Workarounds/DisableLightScattering/patches.txt
similarity index 100%
rename from Workarounds/SonicLostWorld_DisableLightScattering/patches.txt
rename to src/SonicLostWorld/Workarounds/DisableLightScattering/patches.txt
diff --git a/Workarounds/SonicLostWorld_DisableLightScattering/rules.txt b/src/SonicLostWorld/Workarounds/DisableLightScattering/rules.txt
similarity index 85%
rename from Workarounds/SonicLostWorld_DisableLightScattering/rules.txt
rename to src/SonicLostWorld/Workarounds/DisableLightScattering/rules.txt
index b53bb2e4..fb4aa34b 100644
--- a/Workarounds/SonicLostWorld_DisableLightScattering/rules.txt
+++ b/src/SonicLostWorld/Workarounds/DisableLightScattering/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = Disable Light Scattering
 path = "Sonic Lost World/Workarounds/Disable Light Scattering"
-description = Disables light scattering, which removes the rainbow effect. Made by Skyth.
-version = 4
+description = Disables light scattering, which removes the rainbow effect.||Made by Skyth.
+version = 6
diff --git a/Workarounds/SonicLostWorld_DisablePostProcessing/1adfa527e4ea7f40_0000000000001e49_ps.txt b/src/SonicLostWorld/Workarounds/DisablePostProcessing/1adfa527e4ea7f40_0000000000001e49_ps.txt
similarity index 100%
rename from Workarounds/SonicLostWorld_DisablePostProcessing/1adfa527e4ea7f40_0000000000001e49_ps.txt
rename to src/SonicLostWorld/Workarounds/DisablePostProcessing/1adfa527e4ea7f40_0000000000001e49_ps.txt
diff --git a/Workarounds/SonicLostWorld_DisablePostProcessing/3c6c7691f6e2f2e4_0000000000001e49_ps.txt b/src/SonicLostWorld/Workarounds/DisablePostProcessing/3c6c7691f6e2f2e4_0000000000001e49_ps.txt
similarity index 100%
rename from Workarounds/SonicLostWorld_DisablePostProcessing/3c6c7691f6e2f2e4_0000000000001e49_ps.txt
rename to src/SonicLostWorld/Workarounds/DisablePostProcessing/3c6c7691f6e2f2e4_0000000000001e49_ps.txt
diff --git a/Workarounds/SonicLostWorld_DisablePostProcessing/4fab679c75795f90_00000000000003c9_ps.txt b/src/SonicLostWorld/Workarounds/DisablePostProcessing/4fab679c75795f90_00000000000003c9_ps.txt
similarity index 100%
rename from Workarounds/SonicLostWorld_DisablePostProcessing/4fab679c75795f90_00000000000003c9_ps.txt
rename to src/SonicLostWorld/Workarounds/DisablePostProcessing/4fab679c75795f90_00000000000003c9_ps.txt
diff --git a/Workarounds/SonicLostWorld_DisablePostProcessing/91f43f263091c56d_0000000000079249_ps.txt b/src/SonicLostWorld/Workarounds/DisablePostProcessing/91f43f263091c56d_0000000000079249_ps.txt
similarity index 100%
rename from Workarounds/SonicLostWorld_DisablePostProcessing/91f43f263091c56d_0000000000079249_ps.txt
rename to src/SonicLostWorld/Workarounds/DisablePostProcessing/91f43f263091c56d_0000000000079249_ps.txt
diff --git a/Workarounds/SonicLostWorld_DisablePostProcessing/rules.txt b/src/SonicLostWorld/Workarounds/DisablePostProcessing/rules.txt
similarity index 68%
rename from Workarounds/SonicLostWorld_DisablePostProcessing/rules.txt
rename to src/SonicLostWorld/Workarounds/DisablePostProcessing/rules.txt
index 9729b99b..6bca954d 100644
--- a/Workarounds/SonicLostWorld_DisablePostProcessing/rules.txt
+++ b/src/SonicLostWorld/Workarounds/DisablePostProcessing/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010135700,000500001012B100,0005000010128F00
 name = Disable Post Processing Effects
 path = "Sonic Lost World/Workarounds/Disable Post Processing Effects"
-description = Disables the game's post processing effects, making it overall appear not so dark but at the cost of bloom, depth of field, and heat waves.|Some stages will either appear either brighter or darker than they should.|Made by M&&M.
-version = 4
+description = Disables the game's post processing effects, making it overall appear not so dark but at the cost of bloom, depth of field, heat waves and other effects.|Some stages will either appear either brighter or darker than they should.||Made by M&&M.
+version = 6