diff --git a/java/src/pm/Main.java b/java/src/pm/Main.java
index 744a3b0..aa01c8c 100644
--- a/java/src/pm/Main.java
+++ b/java/src/pm/Main.java
@@ -3,9 +3,9 @@ package pm;
 import java.util.ArrayList;
 
 import pm.application.ApplicationCycle;
-import pm.application.Winamp.WinampApplication;
 import pm.application.example.ExampleApplication;
-import pm.application.iTunes.iTunesApplication;
+import pm.application.iitunes.iTunesApplication;
+import pm.application.winamp.WinampApplication;
 import pm.application.windows.gomplayer.GomPlayerApplication;
 import pm.application.windows.wmp.WMPApplication;
 import pm.device.gui.GUIDevice;
diff --git a/java/src/pm/application/iTunes/iTunesApplication.java b/java/src/pm/application/iTunes/iTunesApplication.java
deleted file mode 100644
index e341f1a..0000000
--- a/java/src/pm/application/iTunes/iTunesApplication.java
+++ /dev/null
@@ -1,86 +0,0 @@
-package pm.application.iTunes;
-
-import pm.Action;
-import pm.Application;
-import pm.exception.application.ApplicationExitException;
-
-import com.dt.iTunesController.ITCOMDisabledReason;
-import com.dt.iTunesController.ITTrack;
-import com.dt.iTunesController.iTunes;
-import com.dt.iTunesController.iTunesEventsInterface;
-
-public class iTunesApplication extends Application implements iTunesEventsInterface {
-    protected static final int POSTION_CHANGE_RATE = 1;
-    protected static final int VOLUME_CHANGE_RATE = 5;
-    protected static final int SEEK_TIME = 1000;
-
-    protected iTunes iTunes;
-
-    public iTunesApplication() {
-        super();
-        iTunes = new iTunes();
-    }
-
-    public void initialise() {
-        iTunes.connect();
-        iTunes.addEventHandler(this);
-    }
-
-    public void exit() throws ApplicationExitException {
-        System.out.println("Exit iTunesApplication");
-        super.exit();
-        try {
-            iTunes.quit(); // Todo: wachten totdat ook daadwerkelijk gestart? Anders wordt iTunes niet afgesloten.
-        } catch (Exception e) {
-            throw new ApplicationExitException();
-        }
-    }
- 
-    protected void action(Action action) {
-        System.out.println("iTunesApplication: " + action);
-        switch (action) {
-            case PLAY:
-                iTunes.playPause();
-                break;
-            case NEXT:
-                iTunes.nextTrack();
-                break;
-            case PREVIOUS:
-                iTunes.previousTrack();
-                break;
-            case FORWARD:
-                iTunes.setPlayerPosition(iTunes.getPlayerPosition() + POSTION_CHANGE_RATE);
-                break;
-            case REWIND:
-                iTunes.setPlayerPosition(iTunes.getPlayerPosition() - POSTION_CHANGE_RATE);
-                break;
-            case MUTE:
-                iTunes.toggleMute();
-                break;
-            case VOLUME_UP:
-                iTunes.setSoundVolume(getVolume() + VOLUME_CHANGE_RATE);
-                break;
-            case VOLUME_DOWN:
-                iTunes.setSoundVolume(getVolume() - VOLUME_CHANGE_RATE);
-                break;
-            case SHUFFLE:
-                iTunes.toggleShuffle();
-                break;
-        }
-    }
-
-    protected int getVolume() {
-        return iTunes.getSoundVolume();
-    }
-
-    /* iTunesEventInterface => naar eigen class? */
-    public void onDatabaseChangedEvent(int[][] deletedObjectIDs, int[][] changedObjectIDs) {}
-    public void onPlayerPlayEvent(ITTrack iTrack) {}
-    public void onPlayerStopEvent(ITTrack iTrack) {}
-    public void onPlayerPlayingTrackChangedEvent(ITTrack iTrack) {}
-    public void onCOMCallsDisabledEvent(ITCOMDisabledReason reason) {}
-    public void onCOMCallsEnabledEvent() {}
-    public void onQuittingEvent() {}
-    public void onAboutToPromptUserToQuitEvent() {}
-    public void onSoundVolumeChangedEvent(int newVolume) {}
-}
\ No newline at end of file
diff --git a/java/src/pm/application/Winamp/WinampApplication.java b/java/src/pm/application/wiinamp/WinampApplication.java
similarity index 95%
rename from java/src/pm/application/Winamp/WinampApplication.java
rename to java/src/pm/application/wiinamp/WinampApplication.java
index 220f1c4..b5fe927 100644
--- a/java/src/pm/application/Winamp/WinampApplication.java
+++ b/java/src/pm/application/wiinamp/WinampApplication.java
@@ -1,4 +1,4 @@
-package pm.application.Winamp;
+package pm.application.wiinamp;
 
 import pm.Action;
 import pm.Application;