diff --git a/control/GameStateManager.java b/control/GameStateManager.java
index 8ff3c5c..91f0055 100644
--- a/control/GameStateManager.java
+++ b/control/GameStateManager.java
@@ -4,7 +4,6 @@ import java.awt.Color;
 import java.util.ArrayList;
 import java.util.List;
 
-import model.SongHandler;
 import model.gameState.EndState;
 import model.gameState.GameState;
 import model.gameState.HelpState;
diff --git a/model/SongHandler.java b/control/SongHandler.java
similarity index 96%
rename from model/SongHandler.java
rename to control/SongHandler.java
index 64f8cd6..c7b6083 100644
--- a/model/SongHandler.java
+++ b/control/SongHandler.java
@@ -1,4 +1,4 @@
-package model;
+package control;
 
 import java.io.File;
 import java.util.ArrayList;
@@ -46,9 +46,9 @@ public class SongHandler {
 		
 		songs = DirScanner.scanDirectories(dir);
 		
-		sql.update(songs);
+		//sql.update(songs);
 		
-		sort(new SortPLAYED());
+		//sort(new SortPLAYED());
 		
 		updatePlayer();
 	}
diff --git a/main/Window.java b/main/Window.java
index 83865af..ab532ff 100644
--- a/main/Window.java
+++ b/main/Window.java
@@ -11,11 +11,11 @@ import java.awt.image.BufferedImage;
 import javax.swing.JFrame;
 
 import model.GameModel;
-import model.SongHandler;
 import view.GameView;
 import control.GameControl;
 import control.GameStateManager;
 import control.NetworkHandler;
+import control.SongHandler;
 import control.button.ButtonHandler;
 import control.joystick.JoystickHandler;
 import data.io.SQLConnector;
diff --git a/model/gameState/EndState.java b/model/gameState/EndState.java
index 6cbecbd..4ee11a6 100644
--- a/model/gameState/EndState.java
+++ b/model/gameState/EndState.java
@@ -12,13 +12,13 @@ import java.awt.image.VolatileImage;
 import java.io.IOException;
 
 import model.GameModel;
-import model.SongHandler;
 import model.objects.InfoPanel;
 import model.objects.highscore.HighscoreName;
 
 import com.google.zxing.WriterException;
 
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;
diff --git a/model/gameState/GameState.java b/model/gameState/GameState.java
index 8448c1c..aa9ab16 100644
--- a/model/gameState/GameState.java
+++ b/model/gameState/GameState.java
@@ -2,8 +2,8 @@ package model.gameState;
 
 import java.awt.Graphics2D;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;
diff --git a/model/gameState/HelpState.java b/model/gameState/HelpState.java
index e6cf5b0..5d41227 100644
--- a/model/gameState/HelpState.java
+++ b/model/gameState/HelpState.java
@@ -11,8 +11,8 @@ import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 
 import model.GameModel;
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;
diff --git a/model/gameState/MenuState.java b/model/gameState/MenuState.java
index 547bcdc..479e3f6 100644
--- a/model/gameState/MenuState.java
+++ b/model/gameState/MenuState.java
@@ -17,7 +17,6 @@ import java.util.ArrayList;
 import java.util.List;
 
 import model.GameModel;
-import model.SongHandler;
 import model.objects.DifficultyButton;
 import model.objects.MenuButton;
 import model.objects.highscore.Highscore;
@@ -28,6 +27,7 @@ import audio.sorting.SortAUTHOR;
 import audio.sorting.SortPLAYED;
 import audio.sorting.SortSCORE;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.button.ButtonHandler;
diff --git a/model/gameState/PlayState.java b/model/gameState/PlayState.java
index 37dad58..c03e720 100644
--- a/model/gameState/PlayState.java
+++ b/model/gameState/PlayState.java
@@ -7,7 +7,6 @@ import java.awt.Stroke;
 import java.awt.geom.Rectangle2D;
 import java.util.Iterator;
 
-import model.SongHandler;
 import model.drawObjects.Enemy;
 import model.drawObjects.Player;
 import model.objects.InfoPanel;
@@ -17,6 +16,7 @@ import model.objects.highscore.Highscore;
 import audio.ButtonInstance;
 import audio.ObjectInstance;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.Button;
 import control.button.ButtonEvent;
diff --git a/model/gameState/PreGameState.java b/model/gameState/PreGameState.java
index f890b4c..00edef4 100644
--- a/model/gameState/PreGameState.java
+++ b/model/gameState/PreGameState.java
@@ -8,8 +8,8 @@ import java.awt.Font;
 import java.awt.Graphics2D;
 import java.awt.image.BufferedImage;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
 import data.io.SQLConnector;
diff --git a/model/gameState/TitleState.java b/model/gameState/TitleState.java
index e2a05d2..0141dc3 100644
--- a/model/gameState/TitleState.java
+++ b/model/gameState/TitleState.java
@@ -12,8 +12,8 @@ import java.awt.Transparency;
 import java.awt.image.BufferedImage;
 import java.awt.image.VolatileImage;
 
-import model.SongHandler;
 import control.GameStateManager;
+import control.SongHandler;
 import control.GameStateManager.State;
 import control.button.ButtonEvent;
 import control.joystick.JoystickEvent;
diff --git a/model/objects/InfoPanel.java b/model/objects/InfoPanel.java
index 0c524d4..dc85469 100644
--- a/model/objects/InfoPanel.java
+++ b/model/objects/InfoPanel.java
@@ -11,9 +11,9 @@ import java.awt.Transparency;
 import java.awt.geom.Ellipse2D;
 import java.awt.image.VolatileImage;
 
+import control.SongHandler;
 import control.button.ButtonHandler;
 import main.Window;
-import model.SongHandler;
 import model.gameState.PlayState;
 
 public class InfoPanel {