diff --git a/java/src/pm/Device.java b/java/src/pm/Device.java
index 6f0ae5e..8221041 100644
--- a/java/src/pm/Device.java
+++ b/java/src/pm/Device.java
@@ -1,5 +1,6 @@
 package pm;
 
+import pm.event.Task;
 import pm.exception.device.DeviceExitException;
 import pm.exception.device.DeviceInitialiseException;
 import pm.macro.Sequence;
diff --git a/java/src/pm/Event.java b/java/src/pm/Event.java
new file mode 100644
index 0000000..fc98f67
--- /dev/null
+++ b/java/src/pm/Event.java
@@ -0,0 +1,3 @@
+package pm;
+
+public interface Event {}
diff --git a/java/src/pm/Macro.java b/java/src/pm/Macro.java
index 1b60717..3fd950b 100644
--- a/java/src/pm/Macro.java
+++ b/java/src/pm/Macro.java
@@ -3,7 +3,7 @@ package pm;
 import java.util.ArrayList;
 
 import pm.exception.MacroException;
-import pm.exception.macro.MacroEventOrderException;
+import pm.exception.state.StateOrderException;
 import pm.macro.Sequence;
 import pm.macro.State;
 import pm.macro.state.Hold;
@@ -16,33 +16,33 @@ public class Macro extends Sequence {
         this.eventArray = new State[] {press, new Release(button)};
     }
 
-    public Macro(State... eventArray) throws MacroException {
+    public Macro(State... eventArray) throws StateOrderException {
         ArrayList<Button> holdList = new ArrayList<Button>();
         ArrayList<State> eventList = new ArrayList<State>();
         for (State state : eventArray) {
             Button button = state.getButton();
             if (state instanceof Press) {
                 if (holdList.contains(button)) {
-                    throw new MacroEventOrderException("Press events cannot follow hold events for the same button.");
+                    throw new StateOrderException("Press events cannot follow hold events for the same button.");
                 }
                 eventList.add(state);
                 eventList.add(new Release(button));
             } else if (state instanceof Release) {
                 if (!holdList.contains(button)) {
-                    throw new MacroEventOrderException("Cannot release a button that is not held.");
+                    throw new StateOrderException("Cannot release a button that is not held.");
                 }
                 holdList.remove(button);
                 eventList.add(state);
             } else if (state instanceof Hold) {
                 if (holdList.contains(button)) {
-                    throw new MacroEventOrderException("Cannot hold a button more than once.");
+                    throw new StateOrderException("Cannot hold a button more than once.");
                 }
                 holdList.add(button);
                 eventList.add(new Press(button));
             }
         }
         if (!holdList.isEmpty()) {
-            throw new MacroEventOrderException("One or more buttons are not released.");
+            throw new StateOrderException("One or more buttons are not released.");
         }
         eventArray = (State[]) eventList.toArray(new State[0]);
     }
diff --git a/java/src/pm/device/gui/GUIDeviceUI.java b/java/src/pm/device/gui/GUIDeviceUI.java
index c2e8049..7565a03 100644
--- a/java/src/pm/device/gui/GUIDeviceUI.java
+++ b/java/src/pm/device/gui/GUIDeviceUI.java
@@ -5,7 +5,8 @@ import java.awt.event.ActionListener;
 
 import javax.swing.JButton;
 import javax.swing.JFrame;
-import pm.Task;
+
+import pm.event.Task;
 import pm.task.TaskManager;
 import pm.value.Action;
 import pm.value.Target;
diff --git a/java/src/pm/device/javainput/JavaInputDevice.java b/java/src/pm/device/javainput/JavaInputDevice.java
index 9b7716d..02209e5 100644
--- a/java/src/pm/device/javainput/JavaInputDevice.java
+++ b/java/src/pm/device/javainput/JavaInputDevice.java
@@ -8,7 +8,9 @@ import de.hardcode.jxinput.event.JXInputDirectionalEvent;
 
 import pm.Button;
 import pm.Device;
-import pm.exception.StateException;
+import pm.exception.ButtonException;
+import pm.exception.button.UnknownButtonException;
+import pm.exception.button.UnknownDirectionException;
 import pm.exception.device.DeviceInitialiseException;
 import pm.exception.device.DeviceNotFoundException;
 import pm.macro.state.Press;
@@ -35,7 +37,7 @@ public abstract class JavaInputDevice extends Device {
         //System.out.println(event);
     }
 
-    public void processEvent(JXInputButtonEvent event) throws StateException {
+    public void processEvent(JXInputButtonEvent event) throws ButtonException {
         Button button = getButton(event);
         if (event.getButton().getState()) {
             System.out.println("Press: " + button);
@@ -46,7 +48,7 @@ public abstract class JavaInputDevice extends Device {
         }
     }
 
-    public void processEvent(JXInputDirectionalEvent event) throws StateException {
+    public void processEvent(JXInputDirectionalEvent event) throws UnknownDirectionException {
         Button button = getButton(event);
         if (event.getDirectional().isCentered()) {
             if (previousDirectionalButton != null) {
@@ -60,8 +62,8 @@ public abstract class JavaInputDevice extends Device {
         }
     }
 
-    protected abstract Button getButton(JXInputButtonEvent event) throws StateException;
-    protected abstract Button getButton(JXInputDirectionalEvent event) throws StateException;
+    protected abstract Button getButton(JXInputButtonEvent event) throws UnknownButtonException;
+    protected abstract Button getButton(JXInputDirectionalEvent event) throws UnknownDirectionException;
 
     public static JXInputDevice getDevice(String name) throws DeviceNotFoundException {
         int numberOfDevices = JXInputManager.getNumberOfDevices();
diff --git a/java/src/pm/device/javainput/JavaInputListener.java b/java/src/pm/device/javainput/JavaInputListener.java
index 754f9fa..8b51d4a 100644
--- a/java/src/pm/device/javainput/JavaInputListener.java
+++ b/java/src/pm/device/javainput/JavaInputListener.java
@@ -3,6 +3,7 @@ package pm.device.javainput;
 import java.util.LinkedList;
 import java.util.Queue;
 
+import pm.exception.ButtonException;
 import pm.exception.StateException;
 
 import de.hardcode.jxinput.Axis;
@@ -86,13 +87,13 @@ public class JavaInputListener implements Runnable, JXInputAxisEventListener, JX
             if (!buttonEventQueue.isEmpty()) {
                 try {
                     javaInputDevice.processEvent(buttonEventQueue.poll());
-                } catch (StateException e) {}
+                } catch (ButtonException e) {}
                 sleep = false;
             }
             if (!directionalEventQueue.isEmpty()) {
                 try {
                     javaInputDevice.processEvent(directionalEventQueue.poll());
-                } catch (StateException e) {e.printStackTrace();}
+                } catch (ButtonException e) {}
                 sleep = false;
             }
             if (sleep) {
diff --git a/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java b/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
index 14b6e75..41dc978 100644
--- a/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
+++ b/java/src/pm/device/javainput/extreme3d/Extreme3DDevice.java
@@ -2,9 +2,9 @@ package pm.device.javainput.extreme3d;
 
 import pm.Button;
 import pm.Macro;
-import pm.Task;
 import pm.device.javainput.DirectionButton;
 import pm.device.javainput.JavaInputDevice;
+import pm.event.Task;
 import pm.exception.MacroException;
 import pm.exception.button.UnknownButtonException;
 import pm.exception.button.UnknownDirectionException;
diff --git a/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java b/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
index 109d1b3..bae0eae 100644
--- a/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
+++ b/java/src/pm/device/javainput/rumblepad/RumblepadDevice.java
@@ -1,9 +1,9 @@
 package pm.device.javainput.rumblepad;
 
 import pm.Button;
-import pm.Task;
 import pm.device.javainput.DirectionButton;
 import pm.device.javainput.JavaInputDevice;
+import pm.event.Task;
 import pm.exception.button.UnknownButtonException;
 import pm.exception.button.UnknownDirectionException;
 import pm.exception.device.DeviceInitialiseException;
diff --git a/java/src/pm/device/jintellitype/JIntellitypeDevice.java b/java/src/pm/device/jintellitype/JIntellitypeDevice.java
index 525d904..e84cbb0 100644
--- a/java/src/pm/device/jintellitype/JIntellitypeDevice.java
+++ b/java/src/pm/device/jintellitype/JIntellitypeDevice.java
@@ -7,8 +7,9 @@ import com.melloware.jintellitype.IntellitypeListener;
 import com.melloware.jintellitype.JIntellitype;
 
 import pm.Device;
-import pm.Task;
+import pm.event.Task;
 import pm.exception.StateException;
+import pm.exception.button.UnknownButtonException;
 import pm.exception.device.DeviceInitialiseException;
 import pm.macro.state.Hold;
 import pm.macro.state.Press;
@@ -63,9 +64,7 @@ public class JIntellitypeDevice extends Device implements HotkeyListener, Intell
             System.out.println(commandButton);
             add(new Press(commandButton));
             add(new Release(commandButton));
-        } catch (StateException e) {
-            e.printStackTrace(); // Todo: deze exception verder omhoog gooien
-        }        
+        } catch (UnknownButtonException e) {}        
     }
 
     public void onHotKey(int id) {
diff --git a/java/src/pm/device/text/InputListener.java b/java/src/pm/device/text/InputListener.java
index 4406ea4..60e3f82 100644
--- a/java/src/pm/device/text/InputListener.java
+++ b/java/src/pm/device/text/InputListener.java
@@ -4,7 +4,7 @@ import java.io.InputStream;
 import java.util.Scanner;
 
 import pm.Listener;
-import pm.Task;
+import pm.event.Task;
 import pm.exception.task.TaskNotSupportedException;
 import pm.task.TaskManager;
 import pm.value.Action;
@@ -23,10 +23,8 @@ public class InputListener extends Listener {
             String string = input.next().toUpperCase();
             if(string != null) {
                 try {
-                    try {
-                        TaskManager.add(
-                            new Task(Action.valueOf(string), Target.APPLICATION));
-                    } catch (TaskNotSupportedException e) {}
+                    TaskManager.add(
+                        new Task(Action.valueOf(string), Target.APPLICATION));
                 } catch(IllegalArgumentException e) {}
             }
             try {
diff --git a/java/src/pm/device/wiimote/WiimoteDevice.java b/java/src/pm/device/wiimote/WiimoteDevice.java
index 0d8d8c4..1d7f8e1 100644
--- a/java/src/pm/device/wiimote/WiimoteDevice.java
+++ b/java/src/pm/device/wiimote/WiimoteDevice.java
@@ -6,8 +6,8 @@ import org.wiigee.util.Log;
 
 import pm.Button;
 import pm.Device;
-import pm.Task;
 import pm.device.wiimote.gesture.GestureDevice;
+import pm.event.Task;
 import pm.exception.button.UnknownButtonException;
 import pm.exception.device.DeviceInitialiseException;
 import pm.macro.state.Hold;
diff --git a/java/src/pm/event/Feedback.java b/java/src/pm/event/Feedback.java
new file mode 100644
index 0000000..f4fc746
--- /dev/null
+++ b/java/src/pm/event/Feedback.java
@@ -0,0 +1,7 @@
+package pm.event;
+
+import pm.Event;
+
+public class Feedback implements Event {
+    
+}
diff --git a/java/src/pm/Task.java b/java/src/pm/event/Task.java
similarity index 80%
rename from java/src/pm/Task.java
rename to java/src/pm/event/Task.java
index 21d6c2a..023c75f 100644
--- a/java/src/pm/Task.java
+++ b/java/src/pm/event/Task.java
@@ -1,9 +1,10 @@
-package pm;
+package pm.event;
 
+import pm.Event;
 import pm.value.Action;
 import pm.value.Target;
 
-public class Task {
+public class Task implements Event {
     protected Action action;
     protected Target target;
 
@@ -11,7 +12,7 @@ public class Task {
         this.action = action;
         this.target = target;
     }
-    
+
     public Task(Action action) {
         this(action, Target.SELF);
     }
diff --git a/java/src/pm/exception/StateException.java b/java/src/pm/exception/StateException.java
deleted file mode 100644
index 83d8ad8..0000000
--- a/java/src/pm/exception/StateException.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package pm.exception;
-
-public class StateException extends Exception {
-    protected static final long serialVersionUID = 1L;
-}
diff --git a/java/src/pm/exception/button/UnknownButtonException.java b/java/src/pm/exception/button/UnknownButtonException.java
index 90e9beb..a9ebbf8 100644
--- a/java/src/pm/exception/button/UnknownButtonException.java
+++ b/java/src/pm/exception/button/UnknownButtonException.java
@@ -1,7 +1,7 @@
 package pm.exception.button;
 
-import pm.exception.StateException;
+import pm.exception.ButtonException;
 
-public class UnknownButtonException extends StateException {
+public class UnknownButtonException extends ButtonException {
     protected static final long serialVersionUID = 1L;
 }
diff --git a/java/src/pm/exception/macro/MacroEventOrderException.java b/java/src/pm/exception/macro/MacroEventOrderException.java
deleted file mode 100644
index e630d70..0000000
--- a/java/src/pm/exception/macro/MacroEventOrderException.java
+++ /dev/null
@@ -1,11 +0,0 @@
-package pm.exception.macro;
-
-import pm.exception.MacroException;
-
-public class MacroEventOrderException extends MacroException {
-    protected static final long serialVersionUID = 1L;
-
-    public MacroEventOrderException(String message) {
-        super(message);
-    }
-}
diff --git a/java/src/pm/exception/state/StateOrderException.java b/java/src/pm/exception/state/StateOrderException.java
new file mode 100644
index 0000000..57b3891
--- /dev/null
+++ b/java/src/pm/exception/state/StateOrderException.java
@@ -0,0 +1,11 @@
+package pm.exception.state;
+
+import pm.exception.MacroException;
+
+public class StateOrderException extends MacroException {
+    protected static final long serialVersionUID = 1L;
+
+    public StateOrderException(String message) {
+        super(message);
+    }
+}
diff --git a/java/src/pm/macro/SequenceListener.java b/java/src/pm/macro/SequenceListener.java
index 5afa88b..6ce776e 100644
--- a/java/src/pm/macro/SequenceListener.java
+++ b/java/src/pm/macro/SequenceListener.java
@@ -3,7 +3,7 @@ package pm.macro;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import pm.Task;
+import pm.event.Task;
 import pm.task.TaskListener;
 import pm.task.TaskManager;
 
diff --git a/java/src/pm/task/Continuous.java b/java/src/pm/task/Continuous.java
index 4cd3c0d..205d9ab 100644
--- a/java/src/pm/task/Continuous.java
+++ b/java/src/pm/task/Continuous.java
@@ -1,6 +1,6 @@
 package pm.task;
 
-import pm.Task;
+import pm.event.Task;
 import pm.value.Action;
 import pm.value.Target;
 
diff --git a/java/src/pm/task/Stopper.java b/java/src/pm/task/Stopper.java
index 52ce701..5969f61 100644
--- a/java/src/pm/task/Stopper.java
+++ b/java/src/pm/task/Stopper.java
@@ -1,6 +1,6 @@
 package pm.task;
 
-import pm.Task;
+import pm.event.Task;
 
 public class Stopper extends Task {
     protected Continuous continuous;
diff --git a/java/src/pm/task/TaskListener.java b/java/src/pm/task/TaskListener.java
index 95d55bc..7512711 100644
--- a/java/src/pm/task/TaskListener.java
+++ b/java/src/pm/task/TaskListener.java
@@ -4,7 +4,7 @@ import java.util.Queue;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import pm.Listener;
-import pm.Task;
+import pm.event.Task;
 import pm.value.Action;
 
 public abstract class TaskListener extends Listener implements Runnable {
diff --git a/java/src/pm/task/TaskManager.java b/java/src/pm/task/TaskManager.java
index 0f52912..930ef4b 100644
--- a/java/src/pm/task/TaskManager.java
+++ b/java/src/pm/task/TaskManager.java
@@ -5,8 +5,8 @@ import java.util.ArrayList;
 import pm.Application;
 import pm.Device;
 import pm.Main;
-import pm.Task;
 import pm.application.ApplicationCycle;
+import pm.event.Task;
 import pm.exception.task.TaskNotSupportedException;
 import pm.value.Target;
 
@@ -63,12 +63,10 @@ public class TaskManager {
         }
     }
 
-    public static void add(Task task) throws TaskNotSupportedException {
-        Target target = task.getTarget();
-        if (target.equals(Target.SELF)) {
-            throw new TaskNotSupportedException();
+    public static void add(Task task) {
+        if (!task.getTarget().equals(Target.SELF)) {
+            add(null, task);
         }
-        add(null, task);
     }
 
     public static void remove(TaskListener taskListener) {