Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/manager/TaskTreeManager.java	(revision 451)
@@ -13,4 +13,9 @@
 import java.util.logging.Logger;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.InteractionEvent;
+import de.ugoe.cs.quest.eventcore.userinteraction.KeyInteraction;
+import de.ugoe.cs.quest.eventcore.userinteraction.KeyboardFocusChange;
+import de.ugoe.cs.quest.eventcore.userinteraction.UserInteractionProvider;
 import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.Sequence;
@@ -19,9 +24,4 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.InteractionEvent;
-import de.ugoe.cs.tasktree.userinteraction.KeyInteraction;
-import de.ugoe.cs.tasktree.userinteraction.KeyboardFocusChange;
-import de.ugoe.cs.tasktree.userinteraction.UserInteractionProvider;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultGUIElementSequenceDetectionRule.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultGUIElementSequenceDetectionRule.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultGUIElementSequenceDetectionRule.java	(revision 451)
@@ -8,4 +8,5 @@
 package de.ugoe.cs.quest.tasktrees.temporalrelation;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
 import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.Sequence;
@@ -13,5 +14,4 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultMouseClickReductionRule.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultMouseClickReductionRule.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultMouseClickReductionRule.java	(revision 451)
@@ -8,4 +8,9 @@
 package de.ugoe.cs.quest.tasktrees.temporalrelation;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.MouseButtonDown;
+import de.ugoe.cs.quest.eventcore.userinteraction.MouseButtonInteraction;
+import de.ugoe.cs.quest.eventcore.userinteraction.MouseButtonUp;
+import de.ugoe.cs.quest.eventcore.userinteraction.MouseClick;
 import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.Sequence;
@@ -13,9 +18,4 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.MouseButtonDown;
-import de.ugoe.cs.tasktree.userinteraction.MouseButtonInteraction;
-import de.ugoe.cs.tasktree.userinteraction.MouseButtonUp;
-import de.ugoe.cs.tasktree.userinteraction.MouseClick;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultTextInputReductionRule.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultTextInputReductionRule.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/DefaultTextInputReductionRule.java	(revision 451)
@@ -12,4 +12,10 @@
 import java.util.Locale;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.guimodel.TextArea;
+import de.ugoe.cs.quest.eventcore.guimodel.TextField;
+import de.ugoe.cs.quest.eventcore.userinteraction.KeyInteraction;
+import de.ugoe.cs.quest.eventcore.userinteraction.KeyPressed;
+import de.ugoe.cs.quest.eventcore.userinteraction.KeyReleased;
 import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.Sequence;
@@ -18,13 +24,7 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory;
 import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.guimodel.TextArea;
-import de.ugoe.cs.tasktree.guimodel.TextField;
 import de.ugoe.cs.tasktree.keyboardmaps.KeyboardMap;
 import de.ugoe.cs.tasktree.keyboardmaps.KeyboardMapFactory;
 import de.ugoe.cs.tasktree.keyboardmaps.VirtualKey;
-import de.ugoe.cs.tasktree.userinteraction.KeyInteraction;
-import de.ugoe.cs.tasktree.userinteraction.KeyPressed;
-import de.ugoe.cs.tasktree.userinteraction.KeyReleased;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/temporalrelation/TrackBarSelectionDetectionRule.java	(revision 451)
@@ -8,4 +8,6 @@
 package de.ugoe.cs.quest.tasktrees.temporalrelation;
 
+import de.ugoe.cs.quest.eventcore.guimodel.TrackBar;
+import de.ugoe.cs.quest.eventcore.userinteraction.ValueSelection;
 import de.ugoe.cs.quest.tasktrees.nodeequality.NodeEquality;
 import de.ugoe.cs.quest.tasktrees.nodeequality.NodeEqualityRuleManager;
@@ -17,6 +19,4 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory;
-import de.ugoe.cs.tasktree.guimodel.TrackBar;
-import de.ugoe.cs.tasktree.userinteraction.ValueSelection;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/InteractionTask.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/InteractionTask.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/InteractionTask.java	(revision 451)
@@ -9,7 +9,6 @@
 package de.ugoe.cs.quest.tasktrees.treeifc;
 
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.Interaction;
-
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.Interaction;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/TaskTreeNodeFactory.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/TaskTreeNodeFactory.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeifc/TaskTreeNodeFactory.java	(revision 451)
@@ -8,6 +8,6 @@
 package de.ugoe.cs.quest.tasktrees.treeifc;
 
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.Interaction;
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.Interaction;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/InteractionTaskImpl.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/InteractionTaskImpl.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/InteractionTaskImpl.java	(revision 451)
@@ -9,8 +9,8 @@
 package de.ugoe.cs.quest.tasktrees.treeimpl;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.Interaction;
 import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.Interaction;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeFactoryImpl.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeFactoryImpl.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TaskTreeNodeFactoryImpl.java	(revision 451)
@@ -8,4 +8,6 @@
 package de.ugoe.cs.quest.tasktrees.treeimpl;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.Interaction;
 import de.ugoe.cs.quest.tasktrees.treeifc.InteractionTask;
 import de.ugoe.cs.quest.tasktrees.treeifc.Iteration;
@@ -16,6 +18,4 @@
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNodeFactory;
 import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.Interaction;
 
 //-------------------------------------------------------------------------------------------------
Index: trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TextInputInteractionTaskImpl.java
===================================================================
--- trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TextInputInteractionTaskImpl.java	(revision 439)
+++ trunk/quest-core-tasktrees/src/main/java/de/ugoe/cs/quest/tasktrees/treeimpl/TextInputInteractionTaskImpl.java	(revision 451)
@@ -8,8 +8,8 @@
 package de.ugoe.cs.quest.tasktrees.treeimpl;
 
+import de.ugoe.cs.quest.eventcore.guimodel.GUIElement;
+import de.ugoe.cs.quest.eventcore.userinteraction.TextInput;
 import de.ugoe.cs.quest.tasktrees.treeifc.TaskTreeNode;
 import de.ugoe.cs.quest.tasktrees.treeifc.TextInputInteractionTask;
-import de.ugoe.cs.tasktree.guimodel.GUIElement;
-import de.ugoe.cs.tasktree.userinteraction.TextInput;
 
 //-------------------------------------------------------------------------------------------------