diff --git a/Mods/M&SRio2016_60FPS/patches.txt b/Mods/M&SRio2016_60FPS/patches.txt
deleted file mode 100644
index 35a27734..00000000
--- a/Mods/M&SRio2016_60FPS/patches.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-[M&S2016FpsVerv16]
-moduleMatches = 0xD44C22E3
-
-# 0x020C27D4 = li r3, 1 # original town patch
-
-# 0x2E713530 .original .float 30
-# 0x0298aa0c = lfs f0,0x10(31)
-
-# Code selects .float 60 from 0X1000333C
-
-_60fps = 0x00000000
-
-CodeCaveSize = 0x0c
-
-0X00000000 = lis r3,0x1000
-0X00000004 = lfs f0,0x45b0(r3)
-0X00000008 = blr
-
-0x0298aa0c = bla _60fps
diff --git a/Enhancements/M&SRio2016_NoHUD/0535e0f9e37cf612_0000000000000000_vs.txt b/src/M&SRio2016/Enhancements/NoHUD/0535e0f9e37cf612_0000000000000000_vs.txt
similarity index 100%
rename from Enhancements/M&SRio2016_NoHUD/0535e0f9e37cf612_0000000000000000_vs.txt
rename to src/M&SRio2016/Enhancements/NoHUD/0535e0f9e37cf612_0000000000000000_vs.txt
diff --git a/Enhancements/M&SRio2016_NoHUD/c7a21597bd595a25_0000000000000000_vs.txt b/src/M&SRio2016/Enhancements/NoHUD/c7a21597bd595a25_0000000000000000_vs.txt
similarity index 100%
rename from Enhancements/M&SRio2016_NoHUD/c7a21597bd595a25_0000000000000000_vs.txt
rename to src/M&SRio2016/Enhancements/NoHUD/c7a21597bd595a25_0000000000000000_vs.txt
diff --git a/Enhancements/M&SRio2016_NoHUD/rules.txt b/src/M&SRio2016/Enhancements/NoHUD/rules.txt
similarity index 68%
rename from Enhancements/M&SRio2016_NoHUD/rules.txt
rename to src/M&SRio2016/Enhancements/NoHUD/rules.txt
index 43b60b94..d3041d9f 100644
--- a/Enhancements/M&SRio2016_NoHUD/rules.txt
+++ b/src/M&SRio2016/Enhancements/NoHUD/rules.txt
@@ -2,12 +2,15 @@
 titleIds = 0005000010190300,00050000101E5300,00050000101E5400
 name = No HUD
 path = "Mario & Sonic at the Rio 2016 Olympic Games/Enhancements/No HUD"
-description = Removes the HUD of the game. Made by Slashiee.
-version = 4
+description = Removes the game's HUD.|Made by Slashiee.
+version = 6
+
+[Default]
+$enabled:int = 0
 
 [Preset]
-name = Disabled (Default)
-$enabled:int = 0
+name = Disabled
+default = 1
 
 [Preset]
 name = Enabled
diff --git a/Resolutions/M&SRio2016_Resolution/3e6020499611fa99_0000000000000079_ps.txt b/src/M&SRio2016/Graphics/3e6020499611fa99_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/M&SRio2016_Resolution/3e6020499611fa99_0000000000000079_ps.txt
rename to src/M&SRio2016/Graphics/3e6020499611fa99_0000000000000079_ps.txt
diff --git a/Resolutions/M&SRio2016_Resolution/659f9b24fb22f6e0_0000000000000079_ps.txt b/src/M&SRio2016/Graphics/659f9b24fb22f6e0_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/M&SRio2016_Resolution/659f9b24fb22f6e0_0000000000000079_ps.txt
rename to src/M&SRio2016/Graphics/659f9b24fb22f6e0_0000000000000079_ps.txt
diff --git a/Resolutions/M&SRio2016_Resolution/8923d61563824d41_0000000000000079_ps.txt b/src/M&SRio2016/Graphics/8923d61563824d41_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/M&SRio2016_Resolution/8923d61563824d41_0000000000000079_ps.txt
rename to src/M&SRio2016/Graphics/8923d61563824d41_0000000000000079_ps.txt
diff --git a/Resolutions/M&SRio2016_Resolution/ed790b1d61b86c59_0000000000000079_ps.txt b/src/M&SRio2016/Graphics/ed790b1d61b86c59_0000000000000079_ps.txt
similarity index 100%
rename from Resolutions/M&SRio2016_Resolution/ed790b1d61b86c59_0000000000000079_ps.txt
rename to src/M&SRio2016/Graphics/ed790b1d61b86c59_0000000000000079_ps.txt
diff --git a/Resolutions/M&SRio2016_Resolution/rules.txt b/src/M&SRio2016/Graphics/rules.txt
similarity index 63%
rename from Resolutions/M&SRio2016_Resolution/rules.txt
rename to src/M&SRio2016/Graphics/rules.txt
index 470b5937..a8690663 100644
--- a/Resolutions/M&SRio2016_Resolution/rules.txt
+++ b/src/M&SRio2016/Graphics/rules.txt
@@ -1,92 +1,204 @@
 [Definition]
 titleIds = 0005000010190300,00050000101E5300,00050000101E5400
-name = Resolution
-path = "Mario & Sonic at the Rio 2016 Olympic Games/Graphics/Resolution"
-description = Changes the resolution of the game. Known issues: Lower resolution results in a "deep-fried" look. Depth of field and bloom needs shader edits. Made by Slashiee.
-version = 4
+name = Graphic Options
+path = "Mario & Sonic at the Rio 2016 Olympic Games/Graphics"
+description = Allows you to change the game's TV resolution, gamepad resolution and anisotropic filtering quality.|Made by Slashiee.
+version = 6
 
-[Preset]
-name = 1280x720 (Default)
+[Default]
 $width = 1280
 $height = 720
+$padWidth = 854
+$padHeight = 480
 $gameWidth = 1280
 $gameHeight = 720
+$gamePadWidth = 854
+$gamePadHeight = 480
+$anisotropy = 1
 
-// Performance
+# TV Resolution
 
 [Preset]
 name = 320x180
+category = TV Resolution
 $width = 320
 $height = 180
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 640x360
+category = TV Resolution
 $width = 640
 $height = 360
-$gameWidth = 1280
-$gameHeight = 720
+
+[Preset]
+name = 854x480
+category = TV Resolution
+$width = 854
+$height = 480
 
 [Preset]
 name = 960x540
+category = TV Resolution
 $width = 960
 $height = 540
-$gameWidth = 1280
-$gameHeight = 720
 
-// Common HD Resolutions
+[Preset]
+name = 1280x720
+category = TV Resolution
+default = 1
 
 [Preset]
 name = 1600x900
+category = TV Resolution
 $width = 1600
 $height = 900
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 1920x1080
+category = TV Resolution
 $width = 1920
 $height = 1080
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 2560x1440
+category = TV Resolution
 $width = 2560
 $height = 1440
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3200x1800
+category = TV Resolution
 $width = 3200
 $height = 1800
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 3840x2160
+category = TV Resolution
 $width = 3840
 $height = 2160
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 5120x2880
+category = TV Resolution
 $width = 5120
 $height = 2880
-$gameWidth = 1280
-$gameHeight = 720
 
 [Preset]
 name = 7680x4320
+category = TV Resolution
 $width = 7680
 $height = 4320
-$gameWidth = 1280
-$gameHeight = 720
 
-[TextureRedefine] # Game Resolution
+# Gamepad Resolution
+
+[Preset]
+name = 320x180
+category = Gamepad Resolution
+$padWidth = 320
+$padHeight = 180
+
+[Preset]
+name = 640x360
+category = Gamepad Resolution
+$padWidth = 640
+$padHeight = 360
+
+[Preset]
+name = 854x480
+category = Gamepad Resolution
+default = 1
+
+[Preset]
+name = 960x540
+category = Gamepad Resolution
+$padWidth = 960
+$padHeight = 540
+
+[Preset]
+name = 1280x720
+category = Gamepad Resolution
+$padWidth = 1280
+$padHeight = 720
+
+[Preset]
+name = 1600x900
+category = Gamepad Resolution
+$padWidth = 1600
+$padHeight = 900
+
+[Preset]
+name = 1920x1080
+category = Gamepad Resolution
+$padWidth = 1920
+$padHeight = 1080
+
+[Preset]
+name = 2560x1440
+category = Gamepad Resolution
+$padWidth = 2560
+$padHeight = 1440
+
+[Preset]
+name = 3200x1800
+category = Gamepad Resolution
+$padWidth = 3200
+$padHeight = 1800
+
+[Preset]
+name = 3840x2160
+category = Gamepad Resolution
+$padWidth = 3840
+$padHeight = 2160
+
+[Preset]
+name = 5120x2880
+category = Gamepad Resolution
+$padWidth = 5120
+$padHeight = 2880
+
+[Preset]
+name = 7680x4320
+category = Gamepad Resolution
+$padWidth = 7680
+$padHeight = 4320
+
+# 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 = 0x001 # ignore cpu processed textures
+formatsExcluded = 0x001,0x019,0x01a,0x01f,0x122,0x806,0x80e,0x816,0x820 # ignore viewports and cubemaps
+overwriteAnisotropy = $anisotropy
+
+# Texture Redefines
+
+[TextureRedefine]
 width = 1280
 height = 720
 formatsExcluded = 0x31,0x33
@@ -276,8 +388,16 @@ formats = 0x816,0x80e
 overwriteWidth = ($width / $gameWidth) * 1
 overwriteHeight = ($height / $gameHeight) * 1
 
-[TextureRedefine] # Gamepad Resolution
+# Gamepad Resolution
+
+[TextureRedefine]
 width = 864
 height = 480
-overwriteWidth = ($width / $gameWidth) * 864
-overwriteHeight = ($height / $gameHeight) * 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 864
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
+
+[TextureRedefine]
+width = 854
+height = 480
+overwriteWidth = ($padWidth / $gamePadWidth) * 854
+overwriteHeight = ($padHeight / $gamePadHeight) * 480
diff --git a/src/M&SRio2016/Mods/60FPS/patches.txt b/src/M&SRio2016/Mods/60FPS/patches.txt
new file mode 100644
index 00000000..6fc9cf35
--- /dev/null
+++ b/src/M&SRio2016/Mods/60FPS/patches.txt
@@ -0,0 +1,12 @@
+[unison60FPS]
+moduleMatches = 0xD44C22E3
+
+_60fps = 0x00000000
+
+CodeCaveSize = 0x0c
+
+0X00000000 = lis r3,0x1000
+0X00000004 = lfs f0,0x45b0(r3)
+0X00000008 = blr
+
+0x0298aa0c = bla _60fps
diff --git a/Mods/M&SRio2016_60FPS/rules.txt b/src/M&SRio2016/Mods/60FPS/rules.txt
similarity index 68%
rename from Mods/M&SRio2016_60FPS/rules.txt
rename to src/M&SRio2016/Mods/60FPS/rules.txt
index 8f9181e3..62e0794a 100644
--- a/Mods/M&SRio2016_60FPS/rules.txt
+++ b/src/M&SRio2016/Mods/60FPS/rules.txt
@@ -2,5 +2,5 @@
 titleIds = 0005000010190300,00050000101E5300,00050000101E5400
 name = 60FPS
 path = "Mario & Sonic at the Rio 2016 Olympic Games/Mods/60FPS"
-description = Important: This patches the gameplay to be in 60FPS. Getting under 60FPS will slow down the game's speed. Made by Slashiee and theboy181.
-version = 4
+description = Important: This patches the gameplay to be in 60FPS.|Getting under 60FPS will slow down the game's speed.|Made by theboy181.
+version = 6
diff --git a/Mods/M&SRio2016_ModLoader/patches.txt b/src/M&SRio2016/Mods/ModLoader/patches.txt
similarity index 100%
rename from Mods/M&SRio2016_ModLoader/patches.txt
rename to src/M&SRio2016/Mods/ModLoader/patches.txt
diff --git a/Mods/M&SRio2016_ModLoader/rules.txt b/src/M&SRio2016/Mods/ModLoader/rules.txt
similarity index 100%
rename from Mods/M&SRio2016_ModLoader/rules.txt
rename to src/M&SRio2016/Mods/ModLoader/rules.txt
diff --git a/src/M&SRio2016/Workarounds/OnlineCrash/patches.txt b/src/M&SRio2016/Workarounds/OnlineCrash/patches.txt
new file mode 100644
index 00000000..b27e7f21
--- /dev/null
+++ b/src/M&SRio2016/Workarounds/OnlineCrash/patches.txt
@@ -0,0 +1,4 @@
+[unisonOnlineCrash]
+moduleMatches = 0xD44C22E3
+
+0x02073854 = blr
diff --git a/src/M&SRio2016/Workarounds/OnlineCrash/rules.txt b/src/M&SRio2016/Workarounds/OnlineCrash/rules.txt
new file mode 100644
index 00000000..c8fba88b
--- /dev/null
+++ b/src/M&SRio2016/Workarounds/OnlineCrash/rules.txt
@@ -0,0 +1,6 @@
+[Definition]
+titleIds = 0005000010190300,00050000101E5300,00050000101E5400
+name = Online Crash Skip
+path = "Mario & Sonic at the Rio 2016 Olympic Games/Workarounds/Online Crash Skip"
+description = Skips a crash when launching the game, allow you to boot the game under online mode.|Made by Slashiee.
+version = 6