diff --git a/src/itdelatrisu/opsu/states/OptionsMenu.java b/src/itdelatrisu/opsu/OptionGroups.java
similarity index 99%
rename from src/itdelatrisu/opsu/states/OptionsMenu.java
rename to src/itdelatrisu/opsu/OptionGroups.java
index a43121cb..33b328e3 100644
--- a/src/itdelatrisu/opsu/states/OptionsMenu.java
+++ b/src/itdelatrisu/opsu/OptionGroups.java
@@ -16,13 +16,13 @@
  * along with opsu!.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package itdelatrisu.opsu.states;
+package itdelatrisu.opsu;
 
 import itdelatrisu.opsu.Options.GameOption;
 
 import yugecin.opsudance.ui.OptionsOverlay.OptionTab;
 
-public class OptionsMenu {
+public class OptionGroups {
 
 	public static final OptionTab[] normalOptions = new OptionTab[] {
 		new OptionTab("GENERAL", null),
diff --git a/src/itdelatrisu/opsu/states/Game.java b/src/itdelatrisu/opsu/states/Game.java
index 7e29f88b..6335e558 100644
--- a/src/itdelatrisu/opsu/states/Game.java
+++ b/src/itdelatrisu/opsu/states/Game.java
@@ -18,12 +18,7 @@
 
 package itdelatrisu.opsu.states;
 
-import itdelatrisu.opsu.GameData;
-import itdelatrisu.opsu.GameImage;
-import itdelatrisu.opsu.GameMod;
-import itdelatrisu.opsu.Options;
-import itdelatrisu.opsu.ScoreData;
-import itdelatrisu.opsu.Utils;
+import itdelatrisu.opsu.*;
 import itdelatrisu.opsu.audio.HitSound;
 import itdelatrisu.opsu.audio.MusicController;
 import itdelatrisu.opsu.audio.SoundController;
@@ -34,7 +29,6 @@ import itdelatrisu.opsu.beatmap.HitObject;
 import itdelatrisu.opsu.beatmap.TimingPoint;
 import itdelatrisu.opsu.db.BeatmapDB;
 import itdelatrisu.opsu.db.ScoreDB;
-import itdelatrisu.opsu.downloads.Updater;
 import itdelatrisu.opsu.objects.Circle;
 import itdelatrisu.opsu.objects.DummyObject;
 import itdelatrisu.opsu.objects.GameObject;
@@ -331,7 +325,7 @@ public class Game extends ComplexOpsuState {
 		super();
 		mirrorCursor = new Cursor(true);
 		this.moveStoryboardOverlay = new MoveStoryboard(displayContainer);
-		this.optionsOverlay = new OptionsOverlay(displayContainer, OptionsMenu.storyboardOptions);
+		this.optionsOverlay = new OptionsOverlay(displayContainer, OptionGroups.storyboardOptions);
 		this.storyboardOverlay = new StoryboardOverlay(displayContainer, moveStoryboardOverlay, optionsOverlay, this);
 		storyboardOverlay.show();
 		moveStoryboardOverlay.show();
diff --git a/src/itdelatrisu/opsu/states/SongMenu.java b/src/itdelatrisu/opsu/states/SongMenu.java
index 16696d35..56516f1f 100644
--- a/src/itdelatrisu/opsu/states/SongMenu.java
+++ b/src/itdelatrisu/opsu/states/SongMenu.java
@@ -18,13 +18,8 @@
 
 package itdelatrisu.opsu.states;
 
-import itdelatrisu.opsu.GameData;
+import itdelatrisu.opsu.*;
 import itdelatrisu.opsu.GameData.Grade;
-import itdelatrisu.opsu.GameImage;
-import itdelatrisu.opsu.GameMod;
-import itdelatrisu.opsu.Options;
-import itdelatrisu.opsu.ScoreData;
-import itdelatrisu.opsu.Utils;
 import itdelatrisu.opsu.audio.MultiClip;
 import itdelatrisu.opsu.audio.MusicController;
 import itdelatrisu.opsu.audio.SoundController;
@@ -329,7 +324,7 @@ public class SongMenu extends ComplexOpsuState {
 
 	public SongMenu(DisplayContainer displayContainer) {
 		super();
-		optionsOverlay = new OptionsOverlay(displayContainer, OptionsMenu.normalOptions);
+		optionsOverlay = new OptionsOverlay(displayContainer, OptionGroups.normalOptions);
 		overlays.add(optionsOverlay);
 	}
 
diff --git a/src/yugecin/opsudance/ui/StoryboardOverlay.java b/src/yugecin/opsudance/ui/StoryboardOverlay.java
index cc69aab6..fe9a581d 100644
--- a/src/yugecin/opsudance/ui/StoryboardOverlay.java
+++ b/src/yugecin/opsudance/ui/StoryboardOverlay.java
@@ -22,7 +22,7 @@ import itdelatrisu.opsu.Options.GameOption;
 import itdelatrisu.opsu.audio.MusicController;
 import itdelatrisu.opsu.objects.GameObject;
 import itdelatrisu.opsu.states.Game;
-import itdelatrisu.opsu.states.OptionsMenu;
+import itdelatrisu.opsu.OptionGroups;
 import itdelatrisu.opsu.ui.Fonts;
 import org.newdawn.slick.Color;
 import org.newdawn.slick.Graphics;
@@ -56,7 +56,7 @@ public class StoryboardOverlay extends OverlayOpsuState implements OptionsOverla
 	private final OptionsOverlay optionsOverlay;
 
 	static {
-		for (OptionTab tab : OptionsMenu.storyboardOptions) {
+		for (OptionTab tab : OptionGroups.storyboardOptions) {
 			optionList.addAll(Arrays.asList(tab.options));
 		}
 	}