diff --git a/build.sbt b/build.sbt
index 1f00b42..f7c0c3a 100644
--- a/build.sbt
+++ b/build.sbt
@@ -16,10 +16,10 @@ crossPaths := false
 // Fixes serialization issues:
 fork := true
 
-resolvers += "nexus-retest-maven-all" at " https://nexus.retest.org/repository/all/"
+resolvers += "nexus-retest-maven-all" at "https://nexus.retest.org/repository/all/"
 
 // Dependencies to represent states and actions:
-libraryDependencies += "de.retest" % "surili-commons" % "0.1.0" % "provided" withSources () withJavadoc ()
+libraryDependencies += "de.retest" % "surili-commons" % "0.1.0-SNAPSHOT" withSources () withJavadoc ()
 
 // Dependencies to write GML files for yEd:
 libraryDependencies += "com.github.systemdir.gml" % "GMLWriterForYed" % "2.1.0"
diff --git a/src/main/scala/de/retest/guistatemachine/api/GuiStateMachine.scala b/src/main/scala/de/retest/guistatemachine/api/GuiStateMachine.scala
index a6bd521..271b1c5 100644
--- a/src/main/scala/de/retest/guistatemachine/api/GuiStateMachine.scala
+++ b/src/main/scala/de/retest/guistatemachine/api/GuiStateMachine.scala
@@ -1,7 +1,7 @@
 package de.retest.guistatemachine.api
 
-import de.retest.surili.model.actions.Action
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.Action
 
 /**
   * API to create a NFA which represents the current state machine of an automatic GUI test generation with the help of a genetic algorithm.
diff --git a/src/main/scala/de/retest/guistatemachine/api/State.scala b/src/main/scala/de/retest/guistatemachine/api/State.scala
index 020bf97..11618e8 100644
--- a/src/main/scala/de/retest/guistatemachine/api/State.scala
+++ b/src/main/scala/de/retest/guistatemachine/api/State.scala
@@ -1,10 +1,10 @@
 package de.retest.guistatemachine.api
 
-import de.retest.surili.model.actions.Action
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.Action
 
 /**
-  * A state should be identified by its corresponding `de.retest.ui.descriptors.SutState`.
+  * A state should be identified by its corresponding SutState.
   * It consists of actions which have not been explored yet and transitions to states which build up the state machine.
   */
 trait State {
diff --git a/src/main/scala/de/retest/guistatemachine/api/impl/GraphActionEdge.scala b/src/main/scala/de/retest/guistatemachine/api/impl/GraphActionEdge.scala
index 307bacb..a9ba5d3 100644
--- a/src/main/scala/de/retest/guistatemachine/api/impl/GraphActionEdge.scala
+++ b/src/main/scala/de/retest/guistatemachine/api/impl/GraphActionEdge.scala
@@ -1,7 +1,7 @@
 package de.retest.guistatemachine.api.impl
 
-import de.retest.surili.model.actions.Action
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.Action
 
 case class GraphActionEdge(from: SutState, to: SutState, action: Action) {
   override def toString: String = action.toString
diff --git a/src/main/scala/de/retest/guistatemachine/api/impl/GraphicsProvider.scala b/src/main/scala/de/retest/guistatemachine/api/impl/GraphicsProvider.scala
index 59610af..ec917a1 100644
--- a/src/main/scala/de/retest/guistatemachine/api/impl/GraphicsProvider.scala
+++ b/src/main/scala/de/retest/guistatemachine/api/impl/GraphicsProvider.scala
@@ -3,7 +3,7 @@ package de.retest.guistatemachine.api.impl
 import java.awt.Color
 
 import com.github.systemdir.gml.model.{EdgeGraphicDefinition, GraphicDefinition, NodeGraphicDefinition, YedGmlGraphicsProvider}
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
 
 class GraphicsProvider extends YedGmlGraphicsProvider[SutState, GraphActionEdge, AnyRef] {
   override def getVertexGraphics(vertex: SutState): NodeGraphicDefinition =
diff --git a/src/main/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImpl.scala b/src/main/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImpl.scala
index b12e063..27b2488 100644
--- a/src/main/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImpl.scala
+++ b/src/main/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImpl.scala
@@ -5,8 +5,8 @@ import java.io._
 import com.github.systemdir.gml.YedGmlWriter
 import com.typesafe.scalalogging.Logger
 import de.retest.guistatemachine.api.{GuiStateMachine, State}
-import de.retest.surili.model.actions.Action
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.Action
 import org.jgrapht.graph.DirectedPseudograph
 
 import scala.collection.immutable.{HashMap, HashSet}
diff --git a/src/main/scala/de/retest/guistatemachine/api/impl/StateImpl.scala b/src/main/scala/de/retest/guistatemachine/api/impl/StateImpl.scala
index ec514d5..c2e77cd 100644
--- a/src/main/scala/de/retest/guistatemachine/api/impl/StateImpl.scala
+++ b/src/main/scala/de/retest/guistatemachine/api/impl/StateImpl.scala
@@ -1,8 +1,8 @@
 package de.retest.guistatemachine.api.impl
 
 import de.retest.guistatemachine.api.{ActionTransitions, State}
-import de.retest.surili.model.actions.Action
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.Action
 
 import scala.collection.immutable.HashMap
 
diff --git a/src/test/scala/de/retest/guistatemachine/api/AbstractApiSpec.scala b/src/test/scala/de/retest/guistatemachine/api/AbstractApiSpec.scala
index 3a0f1f8..e30f911 100644
--- a/src/test/scala/de/retest/guistatemachine/api/AbstractApiSpec.scala
+++ b/src/test/scala/de/retest/guistatemachine/api/AbstractApiSpec.scala
@@ -1,9 +1,9 @@
 package de.retest.guistatemachine.api
 
-import java.util.{Arrays, Collections}
+import java.util.Arrays
 
-import de.retest.ui.descriptors._
-import de.retest.ui.image.Screenshot
+import de.retest.recheck.ui.descriptors._
+import de.retest.recheck.ui.image.Screenshot
 import org.scalatest.{Matchers, WordSpec}
 
 abstract trait AbstractApiSpec extends WordSpec with Matchers {
@@ -24,18 +24,21 @@ abstract trait AbstractApiSpec extends WordSpec with Matchers {
     * @param numberOfContainedComponents This value is a criteria for equality of the returned element.
     * @return A new root element which is equal to itself but not to any other root element.
     */
-  def getRootElement(id: String, numberOfContainedComponents: Int): RootElement = new RootElement(
-    "retestId",
-    getIdentifyingAttributes(id),
-    new Attributes(),
-    new Screenshot("prefix", Array(1, 2, 3), Screenshot.ImageType.PNG),
-    if (numberOfContainedComponents <= 0) { Collections.emptyList() } else {
-      scala.collection.JavaConverters.seqAsJavaList(0 to numberOfContainedComponents map { _ =>
+  def getRootElement(id: String, numberOfContainedComponents: Int): RootElement = {
+    val r = new RootElement(
+      "retestId",
+      getIdentifyingAttributes(id),
+      new Attributes(),
+      new Screenshot("prefix", Array(1, 2, 3), Screenshot.ImageType.PNG),
+      "screen0",
+      0,
+      "My Window"
+    )
+    if (numberOfContainedComponents > 0) {
+      r.addChildren(scala.collection.JavaConverters.seqAsJavaList[Element](0 to numberOfContainedComponents map { _ =>
         getRootElement("x", 0)
-      })
-    },
-    "screen0",
-    0,
-    "My Window"
-  )
+      }))
+    }
+    r
+  }
 }
diff --git a/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineApiImplSpec.scala b/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineApiImplSpec.scala
index 0f85b96..1450f7c 100644
--- a/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineApiImplSpec.scala
+++ b/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineApiImplSpec.scala
@@ -4,8 +4,8 @@ import java.io.File
 import java.util.Arrays
 
 import de.retest.guistatemachine.api.{AbstractApiSpec, Id}
-import de.retest.surili.model.actions.NavigateToAction
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.NavigateToAction
 
 class GuiStateMachineApiImplSpec extends AbstractApiSpec {
   val sut = new GuiStateMachineApiImpl
diff --git a/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImplSpec.scala b/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImplSpec.scala
index aa1d3b6..c3a8ae7 100644
--- a/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImplSpec.scala
+++ b/src/test/scala/de/retest/guistatemachine/api/impl/GuiStateMachineImplSpec.scala
@@ -4,8 +4,8 @@ import java.io.File
 import java.util.Arrays
 
 import de.retest.guistatemachine.api.AbstractApiSpec
-import de.retest.surili.model.actions.{Action, NavigateToAction}
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
+import de.retest.surili.commons.actions.{Action, NavigateToAction}
 import org.scalatest.BeforeAndAfterEach
 
 class GuiStateMachineImplSpec extends AbstractApiSpec with BeforeAndAfterEach {
diff --git a/src/test/scala/de/retest/guistatemachine/api/impl/StateImplSpec.scala b/src/test/scala/de/retest/guistatemachine/api/impl/StateImplSpec.scala
index 6891312..1af3dd8 100644
--- a/src/test/scala/de/retest/guistatemachine/api/impl/StateImplSpec.scala
+++ b/src/test/scala/de/retest/guistatemachine/api/impl/StateImplSpec.scala
@@ -3,7 +3,7 @@ package de.retest.guistatemachine.api.impl
 import java.util.Arrays
 
 import de.retest.guistatemachine.api.AbstractApiSpec
-import de.retest.ui.descriptors.SutState
+import de.retest.recheck.ui.descriptors.SutState
 
 class StateImplSpec extends AbstractApiSpec {
   private val rootElementA = getRootElement("a", 0)