Bug 521799 - Upgrade Docker Integration tests

- upgrade to use org.eclipse.reddeer 2.0.0 instead of
  org.jboss.reddeer 1.2.1
- change internals where needed to match changes in
  upstream project
- upgrade eclipse-4.7 target
- bump up Docker integration tests to 2.0.0
- bump up Docker reddeer to 2.0.0

Change-Id: Iafc99f84b1b958c83046fa1a186793c6c9a4798d
Reviewed-on: https://git.eclipse.org/r/104406
Tested-by: Hudson CI
Reviewed-by: Jeff Johnston <jjohnstn@redhat.com>

67 files changed, 780 insertions, 553 deletions

diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
index b3d80d104a..e57b089387 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/META-INF/MANIFEST.MF
@@ -2,22 +2,24 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.linuxtools.docker.integration.tests;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Require-Bundle: org.junit,
  org.eclipse.linuxtools.docker.ui;bundle-version="2.1.0",
  org.eclipse.core.resources,
  org.eclipse.core.runtime,
- org.eclipse.linuxtools.docker.reddeer;bundle-version="1.0.0",
- org.jboss.reddeer.junit.extension;bundle-version="1.2.1",
- org.jboss.reddeer.common;bundle-version="1.2.1",
- org.jboss.reddeer.core;bundle-version="1.2.1",
- org.jboss.reddeer.eclipse;bundle-version="1.2.1",
- org.jboss.reddeer.core;bundle-version="1.2.1",
- org.jboss.reddeer.swt;bundle-version="1.2.1",
- org.jboss.reddeer.junit;bundle-version="1.2.1",
- org.jboss.reddeer.requirements;bundle-version="1.2.1",
- org.jboss.reddeer.workbench;bundle-version="1.2.1",
+ org.eclipse.linuxtools.docker.reddeer;bundle-version="2.0.0",
+ org.eclipse.reddeer.junit.extension;bundle-version="2.0.0",
+ org.eclipse.reddeer.common;bundle-version="2.0.0",
+ org.eclipse.reddeer.jface;bundle-version="2.0.0",
+ org.eclipse.reddeer.core;bundle-version="2.0.0",
+ org.eclipse.reddeer.eclipse;bundle-version="2.0.0",
+ org.eclipse.reddeer.ui;bundle-version="2.0.0",
+ org.eclipse.reddeer.swt;bundle-version="2.0.0",
+ org.eclipse.reddeer.junit;bundle-version="2.0.0",
+ org.eclipse.reddeer.requirements;bundle-version="2.0.0",
+ org.eclipse.reddeer.workbench.core;bundle-version="2.0.0",
+ org.eclipse.reddeer.workbench;bundle-version="2.0.0",
  org.apache.commons.io,
  org.apache.commons.lang,
  org.eclipse.linuxtools.docker.core,
@@ -25,6 +27,7 @@ Require-Bundle: org.junit,
  com.spotify.docker.client;bundle-version="3.6.8",
  org.eclipse.linuxtools.docker.ui.tests,
  org.eclipse.ui.console,
+ org.eclipse.ui,
  org.eclipse.swt
 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
 Bundle-ActivationPolicy: lazy
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml b/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml
index 46c680623b..4a8942b6ba 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/pom.xml
@@ -8,7 +8,7 @@
 		<version>3.2.0-SNAPSHOT</version>
 	</parent>
 	<artifactId>org.eclipse.linuxtools.docker.integration.tests</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	
 	<properties>
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/AbstractDockerBotTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/AbstractDockerBotTest.java
index 27da0e791e..a4488793eb 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/AbstractDockerBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/AbstractDockerBotTest.java
@@ -30,16 +30,17 @@ import org.eclipse.linuxtools.docker.reddeer.perspective.DockerPerspective;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerExplorerView;
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.AuthenticationMethod;
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.DockerConnection;
-import org.jboss.reddeer.core.exception.CoreLayerException;
-import org.jboss.reddeer.core.handler.ShellHandler;
-import org.jboss.reddeer.eclipse.ui.console.ConsoleView;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
-import org.jboss.reddeer.junit.runner.RedDeerSuite;
-import org.jboss.reddeer.requirements.openperspective.OpenPerspectiveRequirement.OpenPerspective;
-import org.jboss.reddeer.swt.exception.SWTLayerException;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
+import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.junit.runner.RedDeerSuite;
+import org.eclipse.reddeer.requirements.openperspective.OpenPerspectiveRequirement.OpenPerspective;
+import org.eclipse.reddeer.swt.exception.SWTLayerException;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.workbench.handler.WorkbenchShellHandler;
+import org.eclipse.ui.PlatformUI;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.runner.RunWith;
@@ -79,7 +80,7 @@ public abstract class AbstractDockerBotTest {
 	}
 
 	protected static void cleanupShells() {
-		ShellHandler.getInstance().closeAllNonWorbenchShells();
+		WorkbenchShellHandler.getInstance().closeAllNonWorbenchShells();
 	}
 
 	protected List<String> getIds(String stringWithIds) {
@@ -195,7 +196,7 @@ public abstract class AbstractDockerBotTest {
 			new DefaultShell("Secure Storage - Password Hint Needed");
 			new PushButton("NO").click();
 		} catch (CoreLayerException ex) {
-			new PushButton("OK").click();
+			// swallowing intentionally
 		} catch (SWTLayerException e) {
 			try {
 				new DefaultShell("Secure Storage");
@@ -278,24 +279,24 @@ public abstract class AbstractDockerBotTest {
 		}
 	}
 
-	protected PropertiesView openPropertiesTab(String tabName) {
-		PropertiesView propertiesView = new PropertiesView();
+	protected PropertySheet openPropertiesTab(String tabName) {
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		getConnection().select();
 		propertiesView.selectTab(tabName);
 		return propertiesView;
 	}
 
-	protected PropertiesView openPropertiesTabForImage(String tabName, String imageName) {
-		PropertiesView propertiesView = new PropertiesView();
+	protected PropertySheet openPropertiesTabForImage(String tabName, String imageName) {
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		getConnection().getImage(imageName).select();
 		propertiesView.selectTab(tabName);
 		return propertiesView;
 	}
 
-	protected PropertiesView openPropertiesTabForContainer(String tabName, String containerName) {
-		PropertiesView propertiesView = new PropertiesView();
+	protected PropertySheet openPropertiesTabForContainer(String tabName, String containerName) {
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		getConnection().getContainer(containerName).select();
 		propertiesView.selectTab(tabName);
@@ -317,7 +318,7 @@ public abstract class AbstractDockerBotTest {
 	 * @return
 	 */
 	protected boolean isDockerDaemon(int majorVersion, int minorVersion) {
-		PropertiesView infoTab = openPropertiesTab("Info");
+		PropertySheet infoTab = openPropertiesTab("Info");
 		getConnection().select();
 		String daemonVersion = infoTab.getProperty("Version").getPropertyValue();
 		assertTrue("Could not retrieve docker daemon version.", !StringUtils.isBlank(daemonVersion));
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java
index e01bb083f6..6e29722396 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/DockerAllBotTest.java
@@ -38,7 +38,7 @@ import org.eclipse.linuxtools.docker.integration.tests.ui.LaunchDockerImageTest;
 import org.eclipse.linuxtools.docker.integration.tests.ui.PerspectiveTest;
 import org.eclipse.linuxtools.docker.integration.tests.ui.PropertiesViewTest;
 import org.eclipse.linuxtools.docker.integration.tests.ui.SearchDialogTest;
-import org.jboss.reddeer.junit.runner.RedDeerSuite;
+import org.eclipse.reddeer.junit.runner.RedDeerSuite;
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java
index b34251204d..1bd79f4295 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/BasicSecurityTest.java
@@ -23,10 +23,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,7 +71,7 @@ public class BasicSecurityTest extends AbstractImageBotTest {
 			new WaitUntil(new ContainerIsDeployedCondition(CONTAINER_NAME, getConnection()));
 		}
 		new WaitWhile(new JobIsRunning());
-		PropertiesView propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
+		PropertySheet propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
 		String readonlyProp = propertiesView.getProperty("HostConfig", "ReadonlyRootfs").getPropertyValue();
 		assertTrue("Container is not running read-only!", readonlyProp.equals("true"));
 		String tmpfsProp = propertiesView.getProperty("HostConfig", "Tmpfs", "/run").getPropertyValue();
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java
index 5257b7a403..ca1fdfc298 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ContainerLogTest.java
@@ -25,13 +25,13 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.console.ConsoleView;
-import org.jboss.reddeer.swt.api.CTabItem;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.swt.api.CTabItem;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -68,7 +68,7 @@ public class ContainerLogTest extends AbstractImageBotTest {
 			getConnection().refresh();
 			new WaitUntil(new ContainerIsDeployedCondition(CONTAINER_NAME, getConnection()));
 		}
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 	}
 
 	@Test
@@ -98,7 +98,7 @@ public class ContainerLogTest extends AbstractImageBotTest {
 	}
 	
 	private String getContainerLog() {
-		new ContextMenu("Display Log").select();
+		new ContextMenu().getItem("Display Log").select();
 		String consoleText;
 		if (mockitoIsUsed()) {
 			ConsoleView consoleView = new ConsoleView();
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/DockerContainerTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/DockerContainerTest.java
index 8a1cffc377..43d32f9bb7 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/DockerContainerTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/DockerContainerTest.java
@@ -16,10 +16,10 @@ import static org.junit.Assert.assertTrue;
 import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTest;
 import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunSelectionPage;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -54,7 +54,7 @@ public class DockerContainerTest extends AbstractImageBotTest {
 		if(mockitoIsUsed()){
 			MockUtils.runContainer(DEFAULT_CONNECTION_NAME, IMAGE_NAME, IMAGE_TAG_LATEST, CONTAINER_NAME);
 		}
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 		new WaitWhile(new ConsoleHasNoChange());
 		assertTrue("Container does not exists!",containerIsDeployed(CONTAINER_NAME));
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java
index 75418c26cd..ebd59e9824 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/ExposePortTest.java
@@ -19,9 +19,9 @@ import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunSelectionPa
 import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
 import org.eclipse.linuxtools.docker.reddeer.utils.BrowserContentsCheck;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
 import org.junit.After;
 import org.junit.Test;
 
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java
index ebcc4bb220..dcbba1e9a2 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LabelsTest.java
@@ -28,10 +28,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -84,7 +84,7 @@ public class LabelsTest extends AbstractImageBotTest {
 		DockerContainersTab containerTab = new DockerContainersTab();
 		containerTab.searchContainer(CONTAINER_NAME);
 		containerTab.select(CONTAINER_NAME);
-		PropertiesView propertiesView = new PropertiesView();
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		getConnection().getContainer(CONTAINER_NAME).select();
 		propertiesView.selectTab("Inspect");
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java
index 5d1bdf9f92..697a060d7b 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/LinkContainersTest.java
@@ -25,11 +25,11 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.condition.ConsoleHasNoChange;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -111,7 +111,7 @@ public class LinkContainersTest extends AbstractImageBotTest {
 	}
 
 	private String getHttpServerAddress(String containerName) {
-		PropertiesView propertiesView = new PropertiesView();
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		getConnection().getContainer(containerName).select();
 		propertiesView.selectTab("Inspect");
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java
index 5991268e68..34ad8a349b 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/NetworkModeTest.java
@@ -24,10 +24,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -124,7 +124,7 @@ public class NetworkModeTest extends AbstractImageBotTest {
 			new WaitUntil(new ContainerIsDeployedCondition(CONTAINER_NAME, getConnection()));
 		}
 		new WaitWhile(new JobIsRunning());
-		PropertiesView propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
+		PropertySheet propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
 		String networkProp = propertiesView.getProperty("HostConfig", "NetworkMode").getPropertyValue();
 		assertTrue("Container is not running in " + networkMode + " network mode!", networkProp.equals(networkMode));
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java
index 27caf4cd3c..ff7118f4e9 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/PrivilegedModeTest.java
@@ -23,10 +23,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,7 +71,7 @@ public class PrivilegedModeTest extends AbstractImageBotTest {
 			new WaitUntil(new ContainerIsDeployedCondition(CONTAINER_NAME, getConnection()));
 		}
 		new WaitWhile(new JobIsRunning());
-		PropertiesView propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
+		PropertySheet propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
 		String privilegedProp = propertiesView.getProperty("HostConfig", "Privileged").getPropertyValue();
 		assertTrue("Container is not running in privileged mode!", privilegedProp.equals("true"));
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java
index a1ae72d81f..4d4b5e6507 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/UnconfinedTest.java
@@ -23,10 +23,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -71,7 +71,7 @@ public class UnconfinedTest extends AbstractImageBotTest {
 			new WaitUntil(new ContainerIsDeployedCondition(CONTAINER_NAME, getConnection()));
 		}
 		new WaitWhile(new JobIsRunning());
-		PropertiesView propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
+		PropertySheet propertiesView = openPropertiesTabForContainer("Inspect", CONTAINER_NAME);
 		String securityProp = propertiesView.getProperty("HostConfig", "SecurityOpt", "").getPropertyValue();
 		assertTrue("Container is not running in seccomp:unconfined mode!", securityProp.equals("seccomp:unconfined"));
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java
index fadfba3491..66011aba9f 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VariablesTest.java
@@ -26,8 +26,8 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFacto
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageInfoFactory;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
index 54047fa00e..5583fe2361 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/container/VolumeMountTest.java
@@ -29,10 +29,10 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockContainerInfoFact
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/AbstractImageBotTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/AbstractImageBotTest.java
index 46ce1a604d..0c1e477353 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/AbstractImageBotTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/AbstractImageBotTest.java
@@ -24,19 +24,18 @@ import org.eclipse.linuxtools.docker.reddeer.condition.ContainerIsDeployedCondit
 import org.eclipse.linuxtools.docker.reddeer.preferences.RegistryAccountsPreferencePage;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.DockerImage;
-import org.jboss.reddeer.common.exception.RedDeerException;
-import org.jboss.reddeer.common.exception.WaitTimeoutExpiredException;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.condition.ConsoleHasNoChange;
-import org.jboss.reddeer.eclipse.ui.console.ConsoleView;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
-import org.jboss.reddeer.jface.preference.PreferenceDialog;
-import org.jboss.reddeer.swt.exception.SWTLayerException;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.workbench.ui.dialogs.WorkbenchPreferenceDialog;
+import org.eclipse.reddeer.common.exception.RedDeerException;
+import org.eclipse.reddeer.common.exception.WaitTimeoutExpiredException;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
+import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.workbench.ui.dialogs.WorkbenchPreferenceDialog;
 import org.junit.After;
 
 /**
@@ -87,7 +86,7 @@ public class AbstractImageBotTest extends AbstractDockerBotTest {
 		imageTab.activate();
 		imageTab.refresh();
 
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 
 		return imageTab;
 	}
@@ -119,28 +118,28 @@ public class AbstractImageBotTest extends AbstractDockerBotTest {
 	}
 
 	protected void setUpRegister(String serverAddress, String email, String userName, String password) {
-		PreferenceDialog dialog = new WorkbenchPreferenceDialog();
-		RegistryAccountsPreferencePage page = new RegistryAccountsPreferencePage();
+		WorkbenchPreferenceDialog dialog = new WorkbenchPreferenceDialog();
+		RegistryAccountsPreferencePage page = new RegistryAccountsPreferencePage(dialog);
 		dialog.open();
 		dialog.select(page);
 		page.removeRegistry(serverAddress);
 		page.addRegistry(serverAddress, email, userName, password);
 		try {
 			new DefaultShell("New Registry Account").setFocus();
-		} catch (SWTLayerException e) {
+		} catch (CoreLayerException e) {
 			new DefaultShell("Preferences").setFocus();
 		}
 		new PushButton("Apply and Close").click();
 	}
 
 	protected void deleteRegister(String serverAddress) {
-		PreferenceDialog dialog = new WorkbenchPreferenceDialog();
-		RegistryAccountsPreferencePage page = new RegistryAccountsPreferencePage();
+		WorkbenchPreferenceDialog dialog = new WorkbenchPreferenceDialog();
+		RegistryAccountsPreferencePage page = new RegistryAccountsPreferencePage(dialog);
 		dialog.open();
 		dialog.select(page);
 		page.removeRegistry(serverAddress);
 		new WaitWhile(new JobIsRunning());
-		new PushButton("Apply and Close").click();
+		dialog.ok();
 	}
 
 	protected void deleteRegisterIfExists(String serverAddress) {
@@ -288,7 +287,7 @@ public class AbstractImageBotTest extends AbstractDockerBotTest {
 	}
 
 	protected String getContainerIP(String containerName) {
-		PropertiesView propertiesView = openPropertiesTabForContainer("Inspect", containerName);
+		PropertySheet propertiesView = openPropertiesTabForContainer("Inspect", containerName);
 		return propertiesView.getProperty("NetworkSettings", "IPAddress").getPropertyValue();
 	}
 	
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java
index 7a6c2d15aa..90ed0a02af 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/EditDockerFileTest.java
@@ -18,22 +18,22 @@ import java.io.IOException;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.api.CTabFolder;
+import org.eclipse.reddeer.swt.api.CTabItem;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.ctab.DefaultCTabFolder;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.styledtext.DefaultStyledText;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.swt.keyboard.KeyboardFactory;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.eclipse.swt.SWT;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.swt.api.CTabFolder;
-import org.jboss.reddeer.swt.api.CTabItem;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.ctab.DefaultCTabFolder;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.styledtext.DefaultStyledText;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
-import org.jboss.reddeer.swt.keyboard.KeyboardFactory;
 import org.junit.After;
 import org.junit.Test;
 
@@ -57,10 +57,11 @@ public class EditDockerFileTest extends AbstractImageBotTest {
 			getConnection();
 			imageTab.activate();
 			new DefaultToolItem("Build Image").click();
-			new WaitUntil(new ShellWithTextIsAvailable("Build a Docker Image"));
+			new WaitUntil(new ShellIsAvailable("Build a Docker Image"));
 			new LabeledText("Image Name:").setText(IMAGE_NAME);
 			new LabeledText("Directory:").setText(dockerFilePath);
 			new PushButton("Edit Dockerfile").click();
+			new WaitUntil(new ShellIsAvailable("Dockerfile Editor"), TimePeriod.LONG);
 			DefaultStyledText defaultStyledText = new DefaultStyledText();
 			String editorText = defaultStyledText.getText();
 			assertTrue("Editor is empty!", StringUtils.isNotEmpty(editorText));
@@ -69,7 +70,6 @@ public class EditDockerFileTest extends AbstractImageBotTest {
 			CTabItem tabItem = tabFolder.getSelection();
 			KeyboardFactory.getKeyboard().invokeKeyCombination(SWT.CTRL,'S');
 			tabItem.close();
-			new WaitUntil(new ShellWithTextIsAvailable("Dockerfile Editor"));
 			new DefaultShell("Build a Docker Image").setFocus();
 			new FinishButton().click();
 			new WaitWhile(new JobIsRunning(), TimePeriod.VERY_LONG);
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java
index 445e30beb1..7443f01343 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/HierarchyViewTest.java
@@ -22,9 +22,9 @@ import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -81,7 +81,7 @@ public class HierarchyViewTest extends AbstractImageBotTest {
 
 	private DockerImageHierarchyTab openDockerImageHierarchyTab() {
 		getConnection().getImage(IMAGE_TEST_BUILD).openImageHierarchy();
-		new WaitWhile(new ShellWithTextIsAvailable("Docker Image Hierarchy"));
+		new WaitWhile(new ShellIsAvailable("Docker Image Hierarchy"));
 		DockerImageHierarchyTab hierarchyTab = new DockerImageHierarchyTab();
 		hierarchyTab.open();
 		return hierarchyTab;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/ImageTagTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/ImageTagTest.java
index 25b8c7e201..10e9c35d04 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/ImageTagTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/ImageTagTest.java
@@ -15,10 +15,10 @@ import static org.junit.Assert.assertTrue;
 
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerExplorerView;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
-import org.jboss.reddeer.common.exception.WaitTimeoutExpiredException;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.swt.impl.button.CancelButton;
+import org.eclipse.reddeer.common.exception.WaitTimeoutExpiredException;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.impl.button.CancelButton;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PullImageTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PullImageTest.java
index 0778402f51..8cf030d7bd 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PullImageTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PullImageTest.java
@@ -13,8 +13,8 @@ package org.eclipse.linuxtools.docker.integration.tests.image;
 
 import static org.junit.Assert.assertTrue;
 
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java
index 647d789fba..68f368c424 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/image/PushImageTest.java
@@ -17,9 +17,9 @@ import static org.junit.Assert.assertTrue;
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockConsoleView.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockConsoleView.java
index a7cf883540..987d6e8e65 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockConsoleView.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockConsoleView.java
@@ -11,7 +11,7 @@
 
 package org.eclipse.linuxtools.docker.integration.tests.mock;
 
-import org.jboss.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
 import org.mockito.Mockito;
 
 public class MockConsoleView {
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
index 0226364df6..dd2493f5e2 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/mock/MockUtils.java
@@ -24,7 +24,7 @@ import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFacto
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionSettingsFinder;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageFactory;
-import org.jboss.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
 
 import com.spotify.docker.client.DockerClient;
 import com.spotify.docker.client.messages.ContainerInfo;
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java
index c2fb801d9f..a487498704 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ComposeTest.java
@@ -32,23 +32,22 @@ import org.eclipse.linuxtools.docker.reddeer.utils.BrowserContentsCheck;
 import org.eclipse.linuxtools.internal.docker.core.DockerCompose;
 import org.eclipse.linuxtools.internal.docker.core.ProcessLauncher;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.CustomMatchers;
-import org.jboss.reddeer.common.matcher.RegexMatcher;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.matcher.WithTextMatcher;
-import org.jboss.reddeer.eclipse.condition.ConsoleHasNoChange;
-import org.jboss.reddeer.jface.preference.PreferenceDialog;
-import org.jboss.reddeer.swt.api.Menu;
-import org.jboss.reddeer.swt.exception.SWTLayerException;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.combo.LabeledCombo;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
-import org.jboss.reddeer.swt.impl.menu.ShellMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.workbench.ui.dialogs.WorkbenchPreferenceDialog;
+import org.eclipse.reddeer.common.matcher.RegexMatcher;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
+import org.eclipse.reddeer.core.matcher.WithTextMatcher;
+import org.eclipse.reddeer.eclipse.condition.ConsoleHasNoChange;
+import org.eclipse.reddeer.jface.preference.PreferenceDialog;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.combo.LabeledCombo;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenuItem;
+import org.eclipse.reddeer.swt.impl.menu.ShellMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.workbench.ui.dialogs.WorkbenchPreferenceDialog;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -108,7 +107,7 @@ public class ComposeTest extends AbstractImageBotTest {
 	public void testCompose() {
 		// Set up Docker Compose location
 		PreferenceDialog dialog = new WorkbenchPreferenceDialog();
-		DockerComposePreferencePage composePreference = new DockerComposePreferencePage();
+		DockerComposePreferencePage composePreference = new DockerComposePreferencePage(dialog);
 		dialog.open();
 		dialog.select(composePreference);
 		composePreference.setPathToDockerCompose(this.dockerComposePath);
@@ -142,21 +141,22 @@ public class ComposeTest extends AbstractImageBotTest {
 		pe.open();
 		pe.getProject(project).getProjectItem(projectFile).select();
 		@SuppressWarnings("unchecked")
-		Menu contextMenu = new ContextMenu(new WithTextMatcher("Run As"), new RegexMatcher(".*Docker Compose"));
+		ContextMenuItem contextMenu = new ContextMenuItem(new WithTextMatcher("Run As"),
+				new RegexMatcher(".*Docker Compose"));
 		contextMenu.select();
 		new OkButton().click();
 		try {
 			new DefaultShell("Docker Compose");
 			new PushButton("Apply and Close").click();
 			fail("Docker Compose has not been found! Is it installed and the path is correct?");
-		} catch (SWTLayerException ex) {
+		} catch (CoreLayerException ex) {
 		}
 		new WaitWhile(new JobIsRunning(), TimePeriod.VERY_LONG);
 		new WaitWhile(new ConsoleHasNoChange());
 	}
 
 	private void importProject(String path) {
-		new ShellMenu("File", "Open Projects from File System...").select();
+		new ShellMenu().getItem("File", "Open Projects from File System...").select();
 		new LabeledCombo("Import source:").setText(path);
 		new FinishButton().click();
 		new WaitWhile(new JobIsRunning());
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ContainerTabTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ContainerTabTest.java
index 6e9ee2318f..b6f7aace53 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ContainerTabTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ContainerTabTest.java
@@ -19,11 +19,11 @@ import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunSelectionPage;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerContainersTab;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
-import org.jboss.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -53,7 +53,7 @@ public class ContainerTabTest extends AbstractImageBotTest {
 		containerTab.activate();
 		containerTab.refresh();
 
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 
 		// get values from Container Tab
 		String nameFromTable = "";
@@ -74,7 +74,7 @@ public class ContainerTabTest extends AbstractImageBotTest {
 		statusFromTable = item.getText(5);
 
 		// get values from Properties view
-		PropertiesView propertiesView = new PropertiesView();
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		getConnection().getContainer(CONTAINER_NAME).select();
 		propertiesView.selectTab("Info");
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ImageTabTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ImageTabTest.java
index f1a60ee967..8bb0415bcc 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ImageTabTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/ImageTabTest.java
@@ -15,11 +15,11 @@ import static org.junit.Assert.assertTrue;
 
 import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTest;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
-import org.jboss.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -45,7 +45,7 @@ public class ImageTabTest extends AbstractImageBotTest {
 		DockerImagesTab imageTab = new DockerImagesTab();
 		imageTab.activate();
 		imageTab.refresh();
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 
 		String idFromTable = "";
 		String repoTagsFromTable = "";
@@ -65,7 +65,7 @@ public class ImageTabTest extends AbstractImageBotTest {
 
 		getConnection().getImage(getCompleteImageName(IMAGE_HELLO_WORLD)).select();
 
-		PropertiesView propertiesView = new PropertiesView();
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		propertiesView.selectTab("Info");
 		String idProp = propertiesView.getProperty("Id").getPropertyValue();
@@ -85,7 +85,7 @@ public class ImageTabTest extends AbstractImageBotTest {
 		DockerImagesTab imageTab = new DockerImagesTab();
 		imageTab.activate();
 		imageTab.refresh();
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 		imageTab.searchImage("aaa");
 		assertTrue("Search result is not 0!", imageTab.getTableItems().size() == 0);
 		imageTab.searchImage("");
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/LaunchDockerImageTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/LaunchDockerImageTest.java
index 32f1595cf2..f57bd64900 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/LaunchDockerImageTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/LaunchDockerImageTest.java
@@ -17,13 +17,13 @@ import org.eclipse.linuxtools.docker.integration.tests.image.AbstractImageBotTes
 import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.condition.ContainerIsDeployedCondition;
 import org.eclipse.linuxtools.docker.reddeer.ui.RunDockerImageLaunchConfiguration;
-import org.jboss.reddeer.common.exception.RedDeerException;
-import org.jboss.reddeer.common.exception.WaitTimeoutExpiredException;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.handler.ShellHandler;
+import org.eclipse.reddeer.common.exception.RedDeerException;
+import org.eclipse.reddeer.common.exception.WaitTimeoutExpiredException;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.workbench.handler.WorkbenchShellHandler;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -90,7 +90,7 @@ public class LaunchDockerImageTest extends AbstractImageBotTest {
 
 	@After
 	public void after() {
-		ShellHandler.getInstance().closeAllNonWorbenchShells();
+		WorkbenchShellHandler.getInstance().closeAllNonWorbenchShells();
 		deleteIfExists(CONFIGURATION_NAME);
 		deleteImageContainerAfter(CONTAINER_NAME);
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/PropertiesViewTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/PropertiesViewTest.java
index 6f62b05903..046aa64400 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/PropertiesViewTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/PropertiesViewTest.java
@@ -16,9 +16,9 @@ import org.eclipse.linuxtools.docker.integration.tests.mock.MockUtils;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageRunSelectionPage;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerContainersTab;
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerImagesTab;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.ui.views.properties.PropertiesView;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.ui.views.properties.PropertySheet;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -58,7 +58,7 @@ public class PropertiesViewTest extends AbstractImageBotTest {
 		}
 		getConnection();
 		// open Properties view
-		PropertiesView propertiesView = new PropertiesView();
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		containerTab.select(CONTAINER_NAME);
 		propertiesView.selectTab("Info");
@@ -71,7 +71,7 @@ public class PropertiesViewTest extends AbstractImageBotTest {
 		// DockerExplorerView de = new DockerExplorerView();
 		// de.open();
 		// de.getDockerConnectionByName(getConnection().getName()).getImage(IMAGE_NAME).select();
-		PropertiesView propertiesView = new PropertiesView();
+		PropertySheet propertiesView = new PropertySheet();
 		propertiesView.open();
 		propertiesView.selectTab("Info");
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java
index 9e8fe3ced2..02ea363464 100644
--- a/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java
+++ b/containers/org.eclipse.linuxtools.docker.integration.tests/src/org/eclipse/linuxtools/docker/integration/tests/ui/SearchDialogTest.java
@@ -23,13 +23,14 @@ import org.eclipse.linuxtools.internal.docker.core.DockerConnection;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerClientFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionFactory;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockImageSearchResultFactory;
-import org.jboss.reddeer.common.wait.AbstractWait;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ProgressInformationShellIsActive;
-import org.jboss.reddeer.swt.impl.button.CancelButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.common.wait.AbstractWait;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.CancelButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 import org.junit.Before;
 import org.junit.Test;
 
@@ -68,7 +69,7 @@ public class SearchDialogTest extends AbstractImageBotTest {
 				pageOne.searchResultsContains(EXPECTED_IMAGE_NAME));
 		pageOne.next();
 
-		new WaitWhile(new ProgressInformationShellIsActive(), TimePeriod.NORMAL);
+//		new WaitUntil(new ShellIsAvailable("Progress Information"), TimePeriod.DEFAULT);
 		AbstractWait.sleep(TimePeriod.getCustom(5));
 		ImageTagSelectionPage pageTwo = new ImageTagSelectionPage();
 		assertFalse("Search tags are empty!", pageTwo.getTags().isEmpty());
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
index 35cb6d4d4c..e591265135 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Docker RedDeer
 Bundle-SymbolicName: org.eclipse.linuxtools.docker.reddeer;singleton:=true
-Bundle-Version: 1.0.0.qualifier
+Bundle-Version: 2.0.0.qualifier
 Bundle-Activator: org.eclipse.linuxtools.docker.reddeer.Activator
 Bundle-ActivationPolicy: lazy
 Bundle-Vendor: Red Hat
@@ -12,15 +12,17 @@ Require-Bundle: org.junit,
  org.eclipse.ui,
  org.eclipse.osgi,
  org.eclipse.core.runtime,
- org.jboss.reddeer.eclipse;bundle-version="1.2.1",
- org.jboss.reddeer.common;bundle-version="1.2.1",
- org.jboss.reddeer.swt;bundle-version="1.2.1",
- org.jboss.reddeer.core;bundle-version="1.2.1",
- org.jboss.reddeer.workbench;bundle-version="1.2.1",
+ org.eclipse.reddeer.eclipse;bundle-version="2.0.0",
+ org.eclipse.reddeer.common;bundle-version="2.0.0",
+ org.eclipse.reddeer.swt;bundle-version="2.0.0",
+ org.eclipse.reddeer.core;bundle-version="2.0.0",
+ org.eclipse.reddeer.workbench;bundle-version="2.0.0",
+ org.eclipse.reddeer.jface;bundle-version="2.0.0",
  org.apache.commons.lang;bundle-version="2.6.0",
  org.eclipse.linuxtools.docker.core,
  org.hamcrest.library;bundle-version="1.3.0",
- org.hamcrest.core;bundle-version="1.3.0"
+ org.hamcrest.core;bundle-version="1.3.0",
+ org.eclipse.reddeer.workbench.core;bundle-version="2.0.0"
 Export-Package: org.eclipse.linuxtools.docker.reddeer.condition,
  org.eclipse.linuxtools.docker.reddeer.core.ui.wizards,
  org.eclipse.linuxtools.docker.reddeer.perspective,
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml b/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml
index 0433bd15e3..85c8121bd5 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/pom.xml
@@ -8,7 +8,7 @@
 		<version>3.2.0-SNAPSHOT</version>
 	</parent>	
 	<artifactId>org.eclipse.linuxtools.docker.reddeer</artifactId>
-	<version>1.0.0-SNAPSHOT</version>
+	<version>2.0.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	
 	<repositories>
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ContainerIsDeployedCondition.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ContainerIsDeployedCondition.java
index f9b0fbb67e..bd4521e388 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ContainerIsDeployedCondition.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ContainerIsDeployedCondition.java
@@ -13,7 +13,7 @@ package org.eclipse.linuxtools.docker.reddeer.condition;
 import static org.junit.Assert.assertNotNull;
 
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.DockerConnection;
-import org.jboss.reddeer.common.condition.AbstractWaitCondition;
+import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
 
 /**
  * @author adietish@redhat.com
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ImageIsDeployedCondition.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ImageIsDeployedCondition.java
index b044bd8644..741dd7ad09 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ImageIsDeployedCondition.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/condition/ImageIsDeployedCondition.java
@@ -14,7 +14,7 @@ import static org.junit.Assert.assertNotNull;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.DockerConnection;
-import org.jboss.reddeer.common.condition.AbstractWaitCondition;
+import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
 
 /**
  * @author adietish@redhat.com
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/DockerConnectionWizard.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/DockerConnectionWizard.java
new file mode 100644
index 0000000000..310ae4011c
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/DockerConnectionWizard.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
+
+import org.eclipse.reddeer.jface.wizard.WizardDialog;
+
+/**
+ * 
+ * @author jkopriva@redhat.com
+ *
+ */
+
+public class DockerConnectionWizard  extends WizardDialog {
+	
+	public DockerConnectionWizard() {
+		super("New Docker Connection");
+	}
+
+}
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunNetworkPage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunNetworkPage.java
index c4b2b1e1e7..3f742e0d0b 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunNetworkPage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunNetworkPage.java
@@ -11,16 +11,17 @@
 
 package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.jface.wizard.WizardPage;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.RadioButton;
-import org.jboss.reddeer.swt.impl.combo.LabeledCombo;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.wizard.WizardPage;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.RadioButton;
+import org.eclipse.reddeer.swt.impl.combo.LabeledCombo;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -30,9 +31,14 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class ImageRunNetworkPage extends WizardPage {
 
+	public ImageRunNetworkPage(ReferencedComposite referencedComposite) {
+		super(referencedComposite);
+		new WaitUntil(new ShellIsAvailable("Run a Docker Image"), TimePeriod.LONG);
+	}
+	
 	public ImageRunNetworkPage() {
-		super();
-		new WaitUntil(new ShellWithTextIsAvailable("Run a Docker Image"), TimePeriod.LONG);
+		super(null);
+		new WaitUntil(new ShellIsAvailable("Run a Docker Image"), TimePeriod.LONG);
 	}
 
 	public void finish() {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunResourceVolumesVariablesPage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunResourceVolumesVariablesPage.java
index 79cc3ad6ec..13273d3b9a 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunResourceVolumesVariablesPage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunResourceVolumesVariablesPage.java
@@ -11,19 +11,20 @@
 
 package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.matcher.WithTextMatcher;
-import org.jboss.reddeer.jface.wizard.WizardPage;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.NextButton;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.button.RadioButton;
-import org.jboss.reddeer.swt.impl.combo.DefaultCombo;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.matcher.WithTextMatcher;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.wizard.WizardPage;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.NextButton;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.button.RadioButton;
+import org.eclipse.reddeer.swt.impl.combo.DefaultCombo;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -33,8 +34,12 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class ImageRunResourceVolumesVariablesPage extends WizardPage {
 
+	public ImageRunResourceVolumesVariablesPage(ReferencedComposite referencedComposite) {
+		super(referencedComposite);
+	}
+
 	public ImageRunResourceVolumesVariablesPage() {
-		super();
+		super(null);
 	}
 
 	public void finish() {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunSelectionPage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunSelectionPage.java
index cd339eb471..198d2fdc7d 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunSelectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunSelectionPage.java
@@ -11,21 +11,22 @@
 
 package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.core.matcher.WithTextMatcher;
-import org.jboss.reddeer.jface.wizard.WizardPage;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.NextButton;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.combo.LabeledCombo;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.matcher.WithTextMatcher;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.wizard.WizardPage;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.NextButton;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.combo.LabeledCombo;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -35,9 +36,14 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class ImageRunSelectionPage extends WizardPage {
 
+	public ImageRunSelectionPage(ReferencedComposite referencedComposite) {
+		super(referencedComposite);
+		new WaitUntil(new ShellIsAvailable("Run a Docker Image"), TimePeriod.LONG);
+	}
+	
 	public ImageRunSelectionPage() {
-		super();
-		new WaitUntil(new ShellWithTextIsAvailable("Run a Docker Image"), TimePeriod.LONG);
+		super(null);
+		new WaitUntil(new ShellIsAvailable("Run a Docker Image"), TimePeriod.LONG);
 	}
 
 	public void finish() {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunWizard.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunWizard.java
new file mode 100644
index 0000000000..9b0822d60b
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageRunWizard.java
@@ -0,0 +1,28 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
+
+import org.eclipse.reddeer.jface.wizard.WizardDialog;
+
+/**
+ * 
+ * @author jkopriva@redhat.com
+ *
+ */
+
+public class ImageRunWizard  extends WizardDialog {
+	
+	public ImageRunWizard() {
+		super("Run a Docker Image");
+	}
+
+}
+
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageSearchPage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageSearchPage.java
index cb8bdf6f3b..6e678548f8 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageSearchPage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageSearchPage.java
@@ -13,17 +13,18 @@ package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
 
 import java.util.List;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.jface.wizard.WizardPage;
-import org.jboss.reddeer.swt.api.TableItem;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.NextButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.wizard.WizardPage;
+import org.eclipse.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.NextButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -33,8 +34,13 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class ImageSearchPage extends WizardPage {
 
+	public ImageSearchPage(ReferencedComposite referencedComposite) {
+		super(referencedComposite);
+		new DefaultShell("Search and pull a Docker image");
+	}
+	
 	public ImageSearchPage() {
-		super();
+		super(null);
 		new DefaultShell("Search and pull a Docker image");
 	}
 
@@ -46,12 +52,12 @@ public class ImageSearchPage extends WizardPage {
 	public void searchImage(String imageName) {
 		new LabeledText("Image:").setText(imageName);
 		new PushButton("Search").click();
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 	}
 
 	public void searchImage() {
 		new PushButton("Search").click();
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 	}
 
 	public List<TableItem> getSearchResults() {
@@ -69,7 +75,7 @@ public class ImageSearchPage extends WizardPage {
 
 	public void next() {
 		new NextButton().click();
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 	}
 
 	public void selectImage(String imageName) {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageTagSelectionPage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageTagSelectionPage.java
index a41d2f1996..b0cd87a523 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageTagSelectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/ImageTagSelectionPage.java
@@ -19,22 +19,28 @@ package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
 
 import java.util.List;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.jface.wizard.WizardPage;
-import org.jboss.reddeer.swt.api.TableItem;
-import org.jboss.reddeer.swt.impl.button.CancelButton;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.wizard.WizardPage;
+import org.eclipse.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.CancelButton;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 public class ImageTagSelectionPage extends WizardPage {
 
+	public ImageTagSelectionPage(ReferencedComposite referencedComposite) {
+		super(referencedComposite);
+		new WaitUntil(new ShellIsAvailable("Search and pull a Docker image"), TimePeriod.DEFAULT);
+	}
+	
 	public ImageTagSelectionPage() {
-		super();
-		new WaitUntil(new ShellWithTextIsAvailable("Search and pull a Docker image"), TimePeriod.NORMAL);
+		super(null);
+		new WaitUntil(new ShellIsAvailable("Search and pull a Docker image"), TimePeriod.DEFAULT);
 	}
 
 	public void finish() {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/NewDockerConnectionPage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/NewDockerConnectionPage.java
index c32b632d1a..0b002b2c8f 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/NewDockerConnectionPage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/NewDockerConnectionPage.java
@@ -12,23 +12,24 @@
 package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
 
 import org.eclipse.linuxtools.docker.reddeer.ui.DockerExplorerView;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.jface.wizard.WizardPage;
-import org.jboss.reddeer.swt.api.Button;
-import org.jboss.reddeer.swt.api.Table;
-import org.jboss.reddeer.swt.condition.WidgetIsEnabled;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.button.RadioButton;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.wizard.WizardPage;
+import org.eclipse.reddeer.swt.api.Button;
+import org.eclipse.reddeer.swt.api.Table;
+import org.eclipse.reddeer.swt.condition.ControlIsEnabled;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.button.RadioButton;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -38,22 +39,27 @@ import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
 public class NewDockerConnectionPage extends WizardPage {
 	private static final String NEW_DOCKER_CONNECTION_SHELL = "New Docker Connection";
 
+	public NewDockerConnectionPage(ReferencedComposite referencedComposite) {
+		super(referencedComposite);
+	}
+
 	public NewDockerConnectionPage() {
-		super();
+		super(null);
 	}
 
 	public void open() {
 		new DockerExplorerView().open();
 		new DefaultToolItem("Add Connection").click();
-		new WaitUntil(new ShellWithTextIsAvailable(NEW_DOCKER_CONNECTION_SHELL));
+		new WaitUntil(new ShellIsAvailable(NEW_DOCKER_CONNECTION_SHELL), TimePeriod.LONG);
 	}
 
 	public void finish() {
-		new WaitUntil(new ShellWithTextIsAvailable(NEW_DOCKER_CONNECTION_SHELL));
-		new WaitUntil(new WidgetIsEnabled(new FinishButton()));
+		new WaitUntil(new ShellIsAvailable(NEW_DOCKER_CONNECTION_SHELL));
+		new WaitUntil(new ControlIsEnabled(new FinishButton()));
 		new FinishButton().click();
 
-		new WaitWhile(new ShellWithTextIsAvailable(NEW_DOCKER_CONNECTION_SHELL), TimePeriod.LONG);
+
+		new WaitWhile(new ShellIsAvailable(NEW_DOCKER_CONNECTION_SHELL), TimePeriod.LONG);
 		new WaitWhile(new JobIsRunning(), TimePeriod.VERY_LONG);
 	}
 
@@ -92,13 +98,13 @@ public class NewDockerConnectionPage extends WizardPage {
 	public void pingConnection() {
 		Button testConnectionButton = new PushButton("Test Connection");
 		testConnectionButton.click();
-		new WaitUntil(new ShellWithTextIsAvailable("Success"));
+		new WaitUntil(new ShellIsAvailable("Success"));
 		new OkButton().click();
 	}
 
 	public void search(String connectionName) {
 		new PushButton("Search...").click();
-		new WaitUntil(new ShellWithTextIsAvailable("Docker Connection Selection"));
+		new WaitUntil(new ShellIsAvailable("Docker Connection Selection"));
 		Table table = new DefaultTable();
 		table.getItem(connectionName).select();
 		new OkButton().click();
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/SearchDockerImageWizard.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/SearchDockerImageWizard.java
new file mode 100644
index 0000000000..01e95f2d5f
--- /dev/null
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/core/ui/wizards/SearchDockerImageWizard.java
@@ -0,0 +1,27 @@
+/*******************************************************************************
+ * Copyright (c) 2017 Red Hat, Inc.
+ * Distributed under license by Red Hat, Inc. All rights reserved.
+ * This program is made available under the terms of the
+ * Eclipse Public License v1.0 which accompanies this distribution,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributor:
+ *     Red Hat, Inc. - initial API and implementation
+ ******************************************************************************/
+package org.eclipse.linuxtools.docker.reddeer.core.ui.wizards;
+
+import org.eclipse.reddeer.jface.wizard.WizardDialog;
+
+/**
+ * 
+ * @author jkopriva@redhat.com
+ *
+ */
+
+public class SearchDockerImageWizard  extends WizardDialog {
+	
+	public SearchDockerImageWizard() {
+		super("Search and pull a Docker image");
+	}
+
+}
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/perspective/AbstractPerspective.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/perspective/AbstractPerspective.java
index 753124934e..60bf0d9b30 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/perspective/AbstractPerspective.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/perspective/AbstractPerspective.java
@@ -10,11 +10,11 @@
  ******************************************************************************/ 
 package org.eclipse.linuxtools.docker.reddeer.perspective;
 
-import org.jboss.reddeer.core.exception.CoreLayerException;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
 
 /**
  * Abstract parent for each Perspective implementation
@@ -22,7 +22,7 @@ import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
  * @author vlado pakan
  * 
  */
-public abstract class AbstractPerspective extends org.jboss.reddeer.eclipse.ui.perspectives.AbstractPerspective {
+public abstract class AbstractPerspective extends org.eclipse.reddeer.eclipse.ui.perspectives.AbstractPerspective {
 
 	/**
 	 * Constructs the perspective with a given label.
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerComposePreferencePage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerComposePreferencePage.java
index 6906653981..57775858d7 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerComposePreferencePage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerComposePreferencePage.java
@@ -11,8 +11,9 @@
 
 package org.eclipse.linuxtools.docker.reddeer.preferences;
 
-import org.jboss.reddeer.jface.preference.PreferencePage;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.preference.PreferencePage;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
 
 /**
  * 
@@ -22,8 +23,13 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class DockerComposePreferencePage extends PreferencePage {
 
+	public DockerComposePreferencePage(ReferencedComposite referenced) {
+		super(referenced, "Docker", "Docker Compose");
+	}
+
+	// Following constructor no longer works
 	public DockerComposePreferencePage() {
-		super("Docker", "Docker Compose");
+		super(null, "Docker", "Docker Compose");
 	}
 
 	public void setPathToDockerCompose(String path) {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerMachinePreferencePage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerMachinePreferencePage.java
index c412feb125..de50f0ee15 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerMachinePreferencePage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerMachinePreferencePage.java
@@ -10,8 +10,9 @@
  ******************************************************************************/
 package org.eclipse.linuxtools.docker.reddeer.preferences;
 
-import org.jboss.reddeer.jface.preference.PreferencePage;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.preference.PreferencePage;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
 
 /**
  * 
@@ -21,8 +22,13 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class DockerMachinePreferencePage extends PreferencePage {
 
+	public DockerMachinePreferencePage(ReferencedComposite referenced) {
+		super(referenced, "Docker", "Docker Machine");
+	}
+
+	// Following constructor no longer works
 	public DockerMachinePreferencePage() {
-		super("Docker", "Docker Machine");
+		super(null, "Docker", "Docker Machine");
 	}
 
 	public void setDockerMachine(String pathToDockerMachine) {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerPreferencePage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerPreferencePage.java
index a68b906090..18ceb343d7 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerPreferencePage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/DockerPreferencePage.java
@@ -11,8 +11,9 @@
 
 package org.eclipse.linuxtools.docker.reddeer.preferences;
 
-import org.jboss.reddeer.jface.preference.PreferencePage;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.preference.PreferencePage;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
 
 /**
  * 
@@ -22,10 +23,15 @@ import org.jboss.reddeer.swt.impl.text.LabeledText;
 
 public class DockerPreferencePage extends PreferencePage {
 
-	public DockerPreferencePage() {
-		super("Docker");
+	public DockerPreferencePage(ReferencedComposite referenced) {
+		super(referenced, "Docker");
 	}
 
+	// Following constructor no longer works
+	public DockerPreferencePage() {
+		super(null, "Docker");
+	}
+	
 	public void setContainerRefreshRate(int seconds) {
 		new LabeledText("Container Refresh Rate (seconds)").setText(String.valueOf(seconds));
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/LoggingPreferencePage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/LoggingPreferencePage.java
index 306f1b6206..faa6793010 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/LoggingPreferencePage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/LoggingPreferencePage.java
@@ -10,8 +10,9 @@
  ******************************************************************************/
 package org.eclipse.linuxtools.docker.reddeer.preferences;
 
-import org.jboss.reddeer.jface.preference.PreferencePage;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.preference.PreferencePage;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
 
 /**
  * 
@@ -21,10 +22,15 @@ import org.jboss.reddeer.swt.impl.button.CheckBox;
 
 public class LoggingPreferencePage extends PreferencePage {
 
-	public LoggingPreferencePage() {
-		super("Docker", "Docker Machine");
+	public LoggingPreferencePage(ReferencedComposite referenced) {
+		super(referenced, "Docker", "Docker Machine");
 	}
 
+	// This constructor no longer works
+	public LoggingPreferencePage() {
+		super(null, "Docker", "Docker Machine");
+	}
+	
 	public void setAutomaticallyLog(boolean toggle) {
 		CheckBox cb = new CheckBox("Automatically log when Container starts");
 		cb.toggle(toggle);
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/RegistryAccountsPreferencePage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/RegistryAccountsPreferencePage.java
index b680607832..00a4067ad2 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/RegistryAccountsPreferencePage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/preferences/RegistryAccountsPreferencePage.java
@@ -10,12 +10,13 @@
  ******************************************************************************/
 package org.eclipse.linuxtools.docker.reddeer.preferences;
 
-import org.jboss.reddeer.jface.preference.PreferencePage;
-import org.jboss.reddeer.swt.api.Table;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.jface.preference.PreferencePage;
+import org.eclipse.reddeer.swt.api.Table;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
 
 /**
  * 
@@ -30,8 +31,13 @@ public class RegistryAccountsPreferencePage extends PreferencePage {
 	public static final String EMAIL = "Email:";
 	public static final String PASSWORD = "Password:";
 
+	public RegistryAccountsPreferencePage(ReferencedComposite referenced) {
+		super(referenced, "Docker", "Registry Accounts");
+	}
+
+	// Following constructor no longer works
 	public RegistryAccountsPreferencePage() {
-		super("Docker", "Registry Accounts");
+		super(null, "Docker", "Registry Accounts");
 	}
 
 	public void addRegistry(String serverAddress, String email, String userName, String password) {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractDockerExplorerItem.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractDockerExplorerItem.java
index 306a578645..83df65502d 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractDockerExplorerItem.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractDockerExplorerItem.java
@@ -11,8 +11,8 @@
 
 package org.eclipse.linuxtools.docker.reddeer.ui;
 
-import org.jboss.reddeer.jface.viewer.handler.TreeViewerHandler;
-import org.jboss.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.jface.handler.TreeViewerHandler;
+import org.eclipse.reddeer.swt.api.TreeItem;
 
 /**
  * 
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractExplorer.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractExplorer.java
index ac3446fbf1..bae063072e 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractExplorer.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractExplorer.java
@@ -13,23 +13,25 @@ package org.eclipse.linuxtools.docker.reddeer.ui;
 import java.util.ArrayList;
 import java.util.List;
 
-import org.jboss.reddeer.common.logging.Logger;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.eclipse.core.resources.AbstractProject;
-import org.jboss.reddeer.eclipse.core.resources.ExplorerItem;
-import org.jboss.reddeer.eclipse.core.resources.Project;
-import org.jboss.reddeer.eclipse.exception.EclipseLayerException;
-import org.jboss.reddeer.eclipse.utils.DeleteUtils;
-import org.jboss.reddeer.jface.viewer.handler.TreeViewerHandler;
-import org.jboss.reddeer.swt.api.Shell;
-import org.jboss.reddeer.swt.api.TreeItem;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.tree.DefaultTree;
+import org.eclipse.reddeer.common.logging.Logger;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.core.resources.AbstractProject;
+import org.eclipse.reddeer.eclipse.core.resources.DefaultProject;
+import org.eclipse.reddeer.eclipse.core.resources.DefaultProjectItem;
+import org.eclipse.reddeer.eclipse.core.resources.Project;
+import org.eclipse.reddeer.eclipse.core.resources.ProjectItem;
+import org.eclipse.reddeer.eclipse.exception.EclipseLayerException;
+import org.eclipse.reddeer.eclipse.utils.DeleteUtils;
+import org.eclipse.reddeer.jface.handler.TreeViewerHandler;
+import org.eclipse.reddeer.swt.api.Shell;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.tree.DefaultTree;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * Common ancestor for Package and Project Explorer and Resource Navigator and any similar ones.
@@ -106,7 +108,7 @@ public class AbstractExplorer extends WorkbenchView {
 		for (TreeItem item : getTree().getItems()){
 			String projectName = treeViewerHandler.getNonStyledText(item);
 			log.debug("Getting project with name "+projectName);
-			projects.add(new Project(item));
+			projects.add(new DefaultProject(item));
 		}
 		return projects;
 	}
@@ -115,11 +117,11 @@ public class AbstractExplorer extends WorkbenchView {
 	 * Provides list of all items in explorer.
 	 * @return list of explorer items
 	 */
-	public List<ExplorerItem> getExplorerItems() {
-		List<ExplorerItem> items = new ArrayList<ExplorerItem>();
+	public List<ProjectItem> getExplorerItems() {
+		List<ProjectItem> items = new ArrayList<ProjectItem>();
 		
 		for (TreeItem item : getTree().getItems()) {
-			items.add(new ExplorerItem(item));
+			items.add(new DefaultProjectItem(item));
 		}		
 		return items;
 	}
@@ -151,9 +153,9 @@ public class AbstractExplorer extends WorkbenchView {
 		activate();
 		if(getProjects().size() > 0){
 			selectAllProjects();
-			new ContextMenu("Refresh").select();
+			new ContextMenu().getItem("Refresh").select();
 			new WaitWhile(new JobIsRunning(), timeout);
-			new ContextMenu("Delete").select();
+			new ContextMenu().getItem("Delete").select();
 			Shell s = new DefaultShell("Delete Resources");
 			new CheckBox().toggle(deleteFromFileSystem);
 			new PushButton("OK").click();
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractView.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractView.java
index 6e2d71b230..8537f8f5a3 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractView.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/AbstractView.java
@@ -12,34 +12,35 @@ package org.eclipse.linuxtools.docker.reddeer.ui;
 
 import java.util.List;
 
+import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
+import org.eclipse.reddeer.common.logging.Logger;
+import org.eclipse.reddeer.common.matcher.RegexMatcher;
+import org.eclipse.reddeer.common.util.Display;
+import org.eclipse.reddeer.common.util.ResultRunnable;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.core.lookup.WidgetLookup;
+import org.eclipse.reddeer.core.matcher.WithTextMatcher;
+import org.eclipse.reddeer.core.matcher.WithTextMatchers;
+import org.eclipse.reddeer.swt.api.CTabItem;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.ctab.DefaultCTabItem;
+import org.eclipse.reddeer.swt.impl.menu.ShellMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.tree.DefaultTreeItem;
+import org.eclipse.reddeer.workbench.api.View;
+import org.eclipse.reddeer.workbench.api.WorkbenchPart;
+import org.eclipse.reddeer.workbench.exception.WorkbenchLayerException;
+import org.eclipse.reddeer.workbench.handler.WorkbenchPartHandler;
+import org.eclipse.reddeer.workbench.impl.shell.WorkbenchShell;
+import org.eclipse.swt.graphics.Image;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.ui.PlatformUI;
 import org.eclipse.ui.actions.ActionFactory;
 import org.eclipse.ui.views.IViewCategory;
 import org.eclipse.ui.views.IViewDescriptor;
 import org.hamcrest.Matcher;
-import org.jboss.reddeer.common.condition.AbstractWaitCondition;
-import org.jboss.reddeer.common.logging.Logger;
-import org.jboss.reddeer.common.matcher.RegexMatcher;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.core.handler.ViewHandler;
-import org.jboss.reddeer.core.handler.WidgetHandler;
-import org.jboss.reddeer.core.handler.WorkbenchPartHandler;
-import org.jboss.reddeer.core.lookup.WidgetLookup;
-import org.jboss.reddeer.core.matcher.WithTextMatcher;
-import org.jboss.reddeer.core.matcher.WithTextMatchers;
-import org.jboss.reddeer.swt.api.CTabItem;
-import org.jboss.reddeer.swt.api.Menu;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.ctab.DefaultCTabItem;
-import org.jboss.reddeer.swt.impl.menu.ShellMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.tree.DefaultTreeItem;
-import org.jboss.reddeer.workbench.api.View;
-import org.jboss.reddeer.workbench.api.WorkbenchPart;
-import org.jboss.reddeer.workbench.exception.WorkbenchLayerException;
-import org.jboss.reddeer.workbench.impl.shell.WorkbenchShell;
 
 /**
  * Abstract class for all View implementations
@@ -84,7 +85,7 @@ public class AbstractView implements View {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.workbench.api.WorkbenchPart#maximize()
+	 * @see org.eclipse.reddeer.workbench.api.WorkbenchPart#maximize()
 	 */
 	@Override
 	public void maximize() {
@@ -94,7 +95,7 @@ public class AbstractView implements View {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.workbench.api.WorkbenchPart#minimize()
+	 * @see org.eclipse.reddeer.workbench.api.WorkbenchPart#minimize()
 	 */
 	@Override
 	public void minimize() {
@@ -121,9 +122,12 @@ public class AbstractView implements View {
 	@Override
 	public void activate() {
 		log.info("Activate view " + getTitle());
+		if (!isOpen()) {
+			open();
+		}
 		cTabItemIsNotNull();
 		getViewCTabItem().activate();
-		ViewHandler.getInstance().focusChildControl();
+//		ViewHandler.getInstance().focusChildControl();
 	}
 
 	/**
@@ -136,7 +140,7 @@ public class AbstractView implements View {
 			cTabItem = null;
 		}
 		if (cTabItem == null) {
-			if (!isOpened()){
+			if (!isOpen()){
 				return cTabItem;
 			}
 			log.debug("Looking up CTabItem with text " + getTitle());
@@ -190,7 +194,7 @@ public class AbstractView implements View {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.workbench.api.WorkbenchPart#close()
+	 * @see org.eclipse.reddeer.workbench.api.WorkbenchPart#close()
 	 */
 	@Override
 	public void close() {
@@ -201,7 +205,7 @@ public class AbstractView implements View {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.workbench.api.View#open()
+	 * @see org.eclipse.reddeer.workbench.api.View#open()
 	 */
 	@Override
 	public void open() {
@@ -219,12 +223,11 @@ public class AbstractView implements View {
 				new RegexMatcher("Window.*"),
 				new RegexMatcher("Show View.*"),
 				new RegexMatcher("Other...*") });
-		Menu menu = new ShellMenu(m.getMatchers());
-		menu.select();
+		new ShellMenu().getItem(m.getMatchers()).select();
 		new DefaultShell(SHOW_VIEW);
 		new DefaultTreeItem(path).select();
 		new PushButton("Open").click();
-		new WaitWhile(new ShellWithTextIsAvailable(SHOW_VIEW));
+		new WaitWhile(new ShellIsAvailable(SHOW_VIEW));
 		new WaitUntil(new ViewCTabIsAvailable());
 	}
 
@@ -265,21 +268,29 @@ public class AbstractView implements View {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.workbench.api.View#isVisible()
+	 * @see org.eclipse.reddeer.workbench.api.View#isVisible()
 	 */
-	@Override
 	public boolean isVisible() {
 		return getViewCTabItem().isShowing();
 	}
 	
+	private String getCTabText(final org.eclipse.swt.custom.CTabItem tabItem){
+		return Display.syncExec(new ResultRunnable<String>() {
+			@Override
+			public String run() {
+				return tabItem.getText();
+			}
+		});
+	}
+
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.workbench.api.View#isOpened()
+	 * @see org.eclipse.reddeer.workbench.api.View#isOpened()
 	 */
 	@Override
-	public boolean isOpened() {
+	public boolean isOpen() {
 		List<org.eclipse.swt.custom.CTabItem> tabs = WidgetLookup.getInstance().activeWidgets(new WorkbenchShell(), org.eclipse.swt.custom.CTabItem.class);
 		for (org.eclipse.swt.custom.CTabItem tab : tabs){
-			String text = WidgetHandler.getInstance().getText(tab);
+			String text = getCTabText(tab);
 			if (viewNameMatcher.matches(text)){
 				return true;
 			}
@@ -297,4 +308,23 @@ public class AbstractView implements View {
 	public boolean isActive(){
 		throw new UnsupportedOperationException("Method isActive is not supported due to the bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=468948");
 	}
+
+	@Override
+	public String getTitleToolTip() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Image getTitleImage() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public Control getControl() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
 }
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java
index c80f66d7f6..077817e636 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserHasURL.java
@@ -11,8 +11,8 @@
 package org.eclipse.linuxtools.docker.reddeer.ui;
 
 import org.hamcrest.Matcher;
-import org.jboss.reddeer.common.condition.AbstractWaitCondition;
-import org.jboss.reddeer.eclipse.ui.browser.BrowserEditor;
+import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
+import org.eclipse.reddeer.eclipse.ui.browser.BrowserEditor;
 
 /**
  * Wait condition which returns true if a given browser has the specified URL.
@@ -69,7 +69,7 @@ public class BrowserHasURL extends AbstractWaitCondition {
 	}
 
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.common.condition.WaitCondition#test()
+	 * @see org.eclipse.reddeer.common.condition.WaitCondition#test()
 	 */
 	@Override
 	public boolean test() {
@@ -90,7 +90,7 @@ public class BrowserHasURL extends AbstractWaitCondition {
 	}
 	
 	/* (non-Javadoc)
-	 * @see org.jboss.reddeer.common.condition.AbstractWaitCondition#description()
+	 * @see org.eclipse.reddeer.common.condition.AbstractWaitCondition#description()
 	 */
 	@Override
 	public String description() {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java
index cd54484660..9aa7214ac8 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/BrowserView.java
@@ -10,12 +10,12 @@
  ******************************************************************************/ 
 package org.eclipse.linuxtools.docker.reddeer.ui;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.swt.api.Browser;
-import org.jboss.reddeer.swt.condition.PageIsLoaded;
-import org.jboss.reddeer.swt.impl.browser.InternalBrowser;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.api.Browser;
+import org.eclipse.reddeer.swt.condition.PageIsLoaded;
+import org.eclipse.reddeer.swt.impl.browser.InternalBrowser;
 
 /**
  * Represents Internal Browser view in Eclipse
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerContainersTab.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerContainersTab.java
index e12a033699..2e5a20528e 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerContainersTab.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerContainersTab.java
@@ -13,11 +13,11 @@ package org.eclipse.linuxtools.docker.reddeer.ui;
 
 import java.util.List;
 
-import org.jboss.reddeer.eclipse.exception.EclipseLayerException;
-import org.jboss.reddeer.swt.api.TableItem;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.text.DefaultText;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.eclipse.exception.EclipseLayerException;
+import org.eclipse.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.text.DefaultText;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
 
 /**
  * 
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerExplorerView.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerExplorerView.java
index 5bf63d2f1b..377934305f 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerExplorerView.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerExplorerView.java
@@ -21,11 +21,11 @@ import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.NewDockerConnection
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.AuthenticationMethod;
 import org.eclipse.linuxtools.docker.reddeer.ui.resources.DockerConnection;
 import org.eclipse.linuxtools.internal.docker.ui.testutils.MockDockerConnectionStorageManagerFactory;
-import org.jboss.reddeer.core.exception.CoreLayerException;
-import org.jboss.reddeer.jface.exception.JFaceLayerException;
-import org.jboss.reddeer.jface.viewer.handler.TreeViewerHandler;
-import org.jboss.reddeer.swt.api.TreeItem;
-import org.jboss.reddeer.swt.impl.tree.DefaultTree;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
+import org.eclipse.reddeer.jface.exception.JFaceLayerException;
+import org.eclipse.reddeer.jface.handler.TreeViewerHandler;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.impl.tree.DefaultTree;
 
 /**
  * 
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImageHierarchyTab.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImageHierarchyTab.java
index 898274b9b9..f9ad8a017e 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImageHierarchyTab.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImageHierarchyTab.java
@@ -13,9 +13,9 @@ package org.eclipse.linuxtools.docker.reddeer.ui;
 
 import java.util.List;
 
-import org.jboss.reddeer.eclipse.exception.EclipseLayerException;
-import org.jboss.reddeer.swt.api.TreeItem;
-import org.jboss.reddeer.swt.impl.tree.DefaultTree;
+import org.eclipse.reddeer.eclipse.exception.EclipseLayerException;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.impl.tree.DefaultTree;
 
 /**
  * 
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImagesTab.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImagesTab.java
index f0277e9e3e..e7ab47f1e6 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImagesTab.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerImagesTab.java
@@ -13,20 +13,20 @@ package org.eclipse.linuxtools.docker.reddeer.ui;
 
 import java.util.List;
 
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.eclipse.exception.EclipseLayerException;
-import org.jboss.reddeer.swt.api.Combo;
-import org.jboss.reddeer.swt.api.TableItem;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.combo.DefaultCombo;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.text.DefaultText;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.eclipse.exception.EclipseLayerException;
+import org.eclipse.reddeer.swt.api.Combo;
+import org.eclipse.reddeer.swt.api.TableItem;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.combo.DefaultCombo;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.text.DefaultText;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
 
 /**
  * 
@@ -65,7 +65,7 @@ public class DockerImagesTab extends WorkbenchView {
 	public void buildImage(String name, String directory) {
 		activate();
 		new DefaultToolItem("Build Image").click();
-		new WaitUntil(new ShellWithTextIsAvailable("Build a Docker Image"));
+		new WaitUntil(new ShellIsAvailable("Build a Docker Image"));
 		new LabeledText("Image Name:").setText(name);
 		new LabeledText("Directory:").setText(directory);
 		new FinishButton().click();
@@ -74,7 +74,7 @@ public class DockerImagesTab extends WorkbenchView {
 	public void runImage(String imageName) {
 		activate();
 		selectImage(imageName);
-		new ContextMenu("Run...").select();
+		new ContextMenu().getItem("Run...").select();
 	}
 
 	public String getImageTags(String imageName) {
@@ -85,7 +85,7 @@ public class DockerImagesTab extends WorkbenchView {
 
 	public void addTagToImage(String imageName, String newTag) {
 		selectImage(imageName);
-		new ContextMenu("Add Tag").select();
+		new ContextMenu().getItem("Add Tag").select();
 		new DefaultShell("Tag Image");
 		new LabeledText("New Tag:").setText(newTag);
 		new FinishButton().click();
@@ -93,7 +93,7 @@ public class DockerImagesTab extends WorkbenchView {
 
 	public void removeTagFromImage(String imageName, String tagToBeRemoved) {
 		selectImage(imageName);
-		new ContextMenu("Remove Tag").select();
+		new ContextMenu().getItem("Remove Tag").select();
 		String fullTag = "";
 		Combo combo = new DefaultCombo();
 		List<String> comboItems = combo.getItems();
@@ -115,7 +115,7 @@ public class DockerImagesTab extends WorkbenchView {
 
 	public void pushImage(String imageName, String registryAccount, boolean forceTagging, boolean keepTaggedImage) {
 		selectImage(imageName);
-		new ContextMenu("Push...").select();
+		new ContextMenu().getItem("Push...").select();
 		Combo combo = new DefaultCombo();
 		combo.setSelection(registryAccount);
 		new CheckBox("Force tagging image with selected registry").toggle(forceTagging);
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerTerminal.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerTerminal.java
index 0dd172ad65..ad4b51a3b3 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerTerminal.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/DockerTerminal.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.linuxtools.docker.reddeer.ui;
 
-import org.jboss.reddeer.swt.api.CTabFolder;
-import org.jboss.reddeer.swt.api.CTabItem;
-import org.jboss.reddeer.swt.impl.ctab.DefaultCTabFolder;
+import org.eclipse.reddeer.swt.api.CTabFolder;
+import org.eclipse.reddeer.swt.api.CTabItem;
+import org.eclipse.reddeer.swt.impl.ctab.DefaultCTabFolder;
 
 /**
  * 
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/EditDockerfile.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/EditDockerfile.java
index d428a51475..6397f48d05 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/EditDockerfile.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/EditDockerfile.java
@@ -11,11 +11,11 @@
 
 package org.eclipse.linuxtools.docker.reddeer.ui;
 
-import org.jboss.reddeer.swt.impl.ctab.DefaultCTabFolder;
-import org.jboss.reddeer.swt.impl.styledtext.DefaultStyledText;
-import org.jboss.reddeer.core.reference.ReferencedComposite;
-import org.jboss.reddeer.swt.api.CTabFolder;
-import org.jboss.reddeer.swt.api.CTabItem;
+import org.eclipse.reddeer.swt.impl.ctab.DefaultCTabFolder;
+import org.eclipse.reddeer.swt.impl.styledtext.DefaultStyledText;
+import org.eclipse.reddeer.core.reference.ReferencedComposite;
+import org.eclipse.reddeer.swt.api.CTabFolder;
+import org.eclipse.reddeer.swt.api.CTabItem;
 
 /**
  * 
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/RunDockerImageLaunchConfiguration.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/RunDockerImageLaunchConfiguration.java
index ff470afe1b..bb4543c546 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/RunDockerImageLaunchConfiguration.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/RunDockerImageLaunchConfiguration.java
@@ -17,28 +17,28 @@ import static org.junit.Assert.assertTrue;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageSearchPage;
 import org.eclipse.linuxtools.docker.reddeer.core.ui.wizards.ImageTagSelectionPage;
 import org.eclipse.linuxtools.docker.reddeer.perspective.DockerPerspective;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ProgressInformationShellIsActive;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.eclipse.debug.ui.launchConfigurations.LaunchConfiguration;
-import org.jboss.reddeer.eclipse.exception.EclipseLayerException;
-import org.jboss.reddeer.swt.api.Table;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.button.RadioButton;
-import org.jboss.reddeer.swt.impl.combo.DefaultCombo;
-import org.jboss.reddeer.swt.impl.combo.LabeledCombo;
-import org.jboss.reddeer.swt.impl.ctab.DefaultCTabItem;
-import org.jboss.reddeer.swt.impl.menu.ShellMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.table.DefaultTable;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
-import org.jboss.reddeer.swt.impl.tree.DefaultTreeItem;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.eclipse.debug.ui.launchConfigurations.LaunchConfiguration;
+import org.eclipse.reddeer.eclipse.exception.EclipseLayerException;
+import org.eclipse.reddeer.swt.api.Table;
+import org.eclipse.reddeer.swt.condition.ShellIsActive;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.button.RadioButton;
+import org.eclipse.reddeer.swt.impl.combo.DefaultCombo;
+import org.eclipse.reddeer.swt.impl.combo.LabeledCombo;
+import org.eclipse.reddeer.swt.impl.ctab.DefaultCTabItem;
+import org.eclipse.reddeer.swt.impl.menu.ShellMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.table.DefaultTable;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.swt.impl.tree.DefaultTreeItem;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -67,8 +67,8 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 	public void open() {
 		DockerPerspective p = new DockerPerspective();
 		p.open();
-		new ShellMenu("Run", "Run Configurations...").select();
-		new WaitUntil(new ShellWithTextIsAvailable("Run Configurations"));
+		new ShellMenu().getItem("Run", "Run Configurations...").select();
+		new WaitUntil(new ShellIsAvailable("Run Configurations"));
 	}
 
 	/**
@@ -93,7 +93,7 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 	private void addValueInTable(String tabName, String shellName, String newValueName, String newValue) {
 		selectTab(tabName);
 		new PushButton("Add...").click();
-		new WaitUntil(new ShellWithTextIsAvailable(shellName));
+		new WaitUntil(new ShellIsAvailable(shellName));
 		new LabeledText("Name:").setText(newValueName);
 		new LabeledText("Value:").setText(newValue);
 		new OkButton().click();
@@ -104,7 +104,7 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 		selectTab(tabName);
 		if (selectItemInTable(oldValueName)) {
 			new PushButton("Edit...");
-			new WaitWhile(new ShellWithTextIsAvailable(shellName));
+			new WaitWhile(new ShellIsAvailable(shellName));
 			new LabeledText("Name:").setText(newValueName);
 			new LabeledText("Value:").setText(newValue);
 			new OkButton().click();
@@ -144,10 +144,10 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 		ImageSearchPage pageOne = new ImageSearchPage();
 		pageOne.searchImage(imageName);
 		pageOne.next();
-		new WaitWhile(new ProgressInformationShellIsActive(), TimePeriod.NORMAL);
+		new WaitWhile(new ShellIsActive("Progress Information"), TimePeriod.DEFAULT);
 		ImageTagSelectionPage pageTwo = new ImageTagSelectionPage();
 		assertFalse("Search tags are empty!", pageTwo.getTags().isEmpty());
-		new WaitWhile(new JobIsRunning(), TimePeriod.NORMAL);
+		new WaitWhile(new JobIsRunning(), TimePeriod.DEFAULT);
 		assertTrue("Search results do not contains tag:" + tag + "!", pageTwo.tagsContains(tag));
 		pageTwo.selectTag(tag);
 		pageTwo.finish();
@@ -236,7 +236,7 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 		selectTab(PORTS_TAB_LABEL);
 		setPublishAllExposedPortsToRandomPorts(false);
 		new PushButton("Add...").click();
-		new WaitUntil(new ShellWithTextIsAvailable("Exposing a Container Port"));
+		new WaitUntil(new ShellIsAvailable("Exposing a Container Port"));
 		new LabeledText("Container port:").setText(containerPort);
 		new LabeledText("Host address:").setText(hostAddress);
 		new LabeledText("Host port:").setText(hostPort);
@@ -248,7 +248,7 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 		setPublishAllExposedPortsToRandomPorts(false);
 		if (selectItemInTable(oldContainerPort)) {
 			new PushButton("Edit...");
-			new WaitUntil(new ShellWithTextIsAvailable("Exposing a Container Port"));
+			new WaitUntil(new ShellIsAvailable("Exposing a Container Port"));
 			new LabeledText("Container port:").setText(newContainerPort);
 			new LabeledText("Host address:").setText(newHostAddress);
 			new LabeledText("Host port:").setText(newHostPort);
@@ -267,7 +267,7 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 	public void addLink(String containerName, String alias) {
 		selectTab(LINKS_TAB_LABEL);
 		new PushButton("Add...").click();
-		new WaitWhile(new ShellWithTextIsAvailable("Container Linking"));
+		new WaitWhile(new ShellIsAvailable("Container Linking"));
 		new LabeledText("Container:").setText(containerName);
 		new LabeledText("Value:").setText(alias);
 		new OkButton().click();
@@ -277,7 +277,7 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 		selectTab(LINKS_TAB_LABEL);
 		if (selectItemInTable(oldContainer)) {
 			new PushButton("Edit...").click();
-			new WaitWhile(new ShellWithTextIsAvailable("Container Linking"));
+			new WaitWhile(new ShellIsAvailable("Container Linking"));
 			new LabeledText("Container:").setText(newContainer);
 			new LabeledText("Value:").setText(newAlias);
 			new OkButton().click();
@@ -375,9 +375,9 @@ public class RunDockerImageLaunchConfiguration extends LaunchConfiguration {
 	public void deleteRunConfiguration(String configuratioName) {
 		selectConfiguration(configuratioName);
 		new DefaultToolItem(DELETE_LAUNCH_CONFIGURATION_LABEL).click();
-		new WaitUntil(new ShellWithTextIsAvailable("Confirm Launch Configuration Deletion"));
+		new WaitUntil(new ShellIsAvailable("Confirm Launch Configuration Deletion"));
 		new PushButton("Yes").click();
-		new WaitUntil(new ShellWithTextIsAvailable("Run Configurations"));
+		new WaitUntil(new ShellIsAvailable("Run Configurations"));
 	}
 
 	public void runConfiguration(String configurationName) {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/WorkbenchView.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/WorkbenchView.java
index 900f8e5114..f242f2d6f8 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/WorkbenchView.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/WorkbenchView.java
@@ -10,7 +10,7 @@
  ******************************************************************************/ 
 package org.eclipse.linuxtools.docker.reddeer.ui;
 
-import org.jboss.reddeer.workbench.api.View;
+import org.eclipse.reddeer.workbench.api.View;
 
 
 /**
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java
index bc3a208558..4aca270447 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerConnection.java
@@ -15,24 +15,23 @@ import java.util.List;
 
 import org.apache.commons.lang.StringUtils;
 import org.eclipse.linuxtools.docker.reddeer.ui.AbstractDockerExplorerItem;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.jface.exception.JFaceLayerException;
-import org.jboss.reddeer.swt.api.Combo;
-import org.jboss.reddeer.swt.api.Shell;
-import org.jboss.reddeer.swt.api.TreeItem;
-import org.jboss.reddeer.swt.condition.ShellIsAvailable;
-import org.jboss.reddeer.swt.condition.WidgetIsEnabled;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.combo.DefaultCombo;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
-import org.jboss.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.jface.exception.JFaceLayerException;
+import org.eclipse.reddeer.swt.api.Combo;
+import org.eclipse.reddeer.swt.api.Shell;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.condition.ControlIsEnabled;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.combo.DefaultCombo;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.swt.impl.toolbar.DefaultToolItem;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -102,7 +101,7 @@ public class DockerConnection extends AbstractDockerExplorerItem {
 	 */
 	public void refreshImages() {
 		treeViewerHandler.getTreeItem(item, "Images").select();
-		new ContextMenu("Refresh").select();
+		new ContextMenu().getItem("Refresh").select();
 		new WaitWhile(new JobIsRunning());
 	}
 
@@ -111,7 +110,7 @@ public class DockerConnection extends AbstractDockerExplorerItem {
 	 */
 	public void refreshContainers() {
 		treeViewerHandler.getTreeItem(item, "Containers").select();
-		new ContextMenu("Refresh").select();
+		new ContextMenu().getItem("Refresh").select();
 		new WaitWhile(new JobIsRunning());
 	}
 
@@ -145,9 +144,9 @@ public class DockerConnection extends AbstractDockerExplorerItem {
 			refreshImages();
 
 			treeViewerHandler.getTreeItem(item, "Images").select();
-			new ContextMenu("Pull...").select();
+			new ContextMenu().getItem("Pull...").select();
 
-			new WaitUntil(new ShellWithTextIsAvailable("Pull Image"), TimePeriod.NORMAL);
+			new WaitUntil(new ShellIsAvailable("Pull Image"), TimePeriod.DEFAULT);
 			Shell pullShell = new DefaultShell("Pull Image");
 
 			// select register
@@ -159,8 +158,8 @@ public class DockerConnection extends AbstractDockerExplorerItem {
 			new LabeledText(IMAGE_NAME_LABEL_DIALOG).setFocus();
 			new LabeledText(IMAGE_NAME_LABEL_DIALOG).setText(imageTag == null ? imageName : imageName + ":" + imageTag);
 
-			new WaitUntil(new WidgetIsEnabled(new FinishButton()));
-			new FinishButton().click();
+			new WaitUntil(new ControlIsEnabled(new FinishButton()));
+			new FinishButton(pullShell).click();
 
 			new WaitWhile(new ShellIsAvailable(pullShell));
 			new WaitWhile(new JobIsRunning(), TimePeriod.VERY_LONG);
@@ -171,9 +170,9 @@ public class DockerConnection extends AbstractDockerExplorerItem {
 		refreshImages();
 
 		treeViewerHandler.getTreeItem(item, "Images").select();
-		new ContextMenu("Pull...").select();
+		new ContextMenu().getItem("Pull...").select();
 
-		new WaitUntil(new ShellWithTextIsAvailable("Pull Image"), TimePeriod.NORMAL);
+		new WaitUntil(new ShellIsAvailable("Pull Image"), TimePeriod.DEFAULT);
 
 		// select register
 		if (dockerRegister != null) {
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerContainer.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerContainer.java
index 443bf87cb5..367f2d9cd5 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerContainer.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerContainer.java
@@ -11,15 +11,14 @@
 package org.eclipse.linuxtools.docker.reddeer.ui.resources;
 
 import org.eclipse.linuxtools.docker.reddeer.ui.AbstractDockerExplorerItem;
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitUntil;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.condition.ShellWithTextIsAvailable;
-import org.jboss.reddeer.swt.api.Menu;
-import org.jboss.reddeer.swt.api.TreeItem;
-import org.jboss.reddeer.swt.impl.button.PushButton;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitUntil;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.PushButton;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -35,15 +34,14 @@ public class DockerContainer extends AbstractDockerExplorerItem {
 
 	public void remove() {
 		select();
-		Menu contextMenu = new ContextMenu("Remove");
-		if (!contextMenu.isEnabled()) {
-			new ContextMenu("Stop").select();
+		boolean removeEnabled = new ContextMenu().getItem("Remove").isEnabled();
+		if (!removeEnabled) {
+			new ContextMenu().getItem("Stop").select();
 			new WaitWhile(new JobIsRunning(), TimePeriod.LONG);
 			item.select();
-			contextMenu = new ContextMenu("Remove");
 		}
-		contextMenu.select();
-		new WaitUntil(new ShellWithTextIsAvailable("Confirm Remove Container"), TimePeriod.NORMAL);
+		new ContextMenu().getItem("Remove").select();
+		new WaitUntil(new ShellIsAvailable("Confirm Remove Container"), TimePeriod.DEFAULT);
 		new PushButton("OK").click();
 		new WaitWhile(new JobIsRunning(), TimePeriod.LONG);
 	}
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerImage.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerImage.java
index 1a60a5fd9a..3505e485e4 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerImage.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/ui/resources/DockerImage.java
@@ -10,21 +10,21 @@
  ******************************************************************************/
 package org.eclipse.linuxtools.docker.reddeer.ui.resources;
 
-import org.jboss.reddeer.common.wait.TimePeriod;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.swt.api.Combo;
-import org.jboss.reddeer.swt.api.Shell;
-import org.jboss.reddeer.swt.api.TreeItem;
-import org.jboss.reddeer.swt.condition.ShellIsAvailable;
-import org.jboss.reddeer.swt.impl.button.CheckBox;
-import org.jboss.reddeer.swt.impl.button.FinishButton;
-import org.jboss.reddeer.swt.impl.button.OkButton;
-import org.jboss.reddeer.swt.impl.combo.DefaultCombo;
-import org.jboss.reddeer.swt.impl.menu.ContextMenu;
-import org.jboss.reddeer.swt.impl.shell.DefaultShell;
-import org.jboss.reddeer.swt.impl.text.LabeledText;
 import org.eclipse.linuxtools.docker.reddeer.ui.AbstractDockerExplorerItem;
+import org.eclipse.reddeer.common.wait.TimePeriod;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.swt.api.Combo;
+import org.eclipse.reddeer.swt.api.Shell;
+import org.eclipse.reddeer.swt.api.TreeItem;
+import org.eclipse.reddeer.swt.condition.ShellIsAvailable;
+import org.eclipse.reddeer.swt.impl.button.CheckBox;
+import org.eclipse.reddeer.swt.impl.button.FinishButton;
+import org.eclipse.reddeer.swt.impl.button.OkButton;
+import org.eclipse.reddeer.swt.impl.combo.DefaultCombo;
+import org.eclipse.reddeer.swt.impl.menu.ContextMenu;
+import org.eclipse.reddeer.swt.impl.shell.DefaultShell;
+import org.eclipse.reddeer.swt.impl.text.LabeledText;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
 
 /**
  * 
@@ -43,7 +43,7 @@ public class DockerImage extends AbstractDockerExplorerItem {
 	 */
 	public void remove() {
 		select();
-		new ContextMenu("Remove").select();
+		new ContextMenu().getItem("Remove").select();
 
 		Shell confirm = new DefaultShell("Confirm Remove Image");
 		new OkButton().click();
@@ -54,12 +54,12 @@ public class DockerImage extends AbstractDockerExplorerItem {
 
 	public void openImageHierarchy() {
 		select();
-		new ContextMenu("Open Image Hierarchy").select();
+		new ContextMenu().getItem("Open Image Hierarchy").select();
 	}
 
 	public void pushImage(String registryAccount, boolean forceTagging, boolean keepTaggedImage) {
 		select();
-		new ContextMenu("Push...").select();
+		new ContextMenu().getItem("Push...").select();
 		new DefaultShell("Push Image");
 		Combo combo = new DefaultCombo();
 		combo.setSelection(registryAccount);
@@ -70,7 +70,7 @@ public class DockerImage extends AbstractDockerExplorerItem {
 
 	public void addTagToImage(String newTag) {
 		select();
-		new ContextMenu("Add Tag").select();
+		new ContextMenu().getItem("Add Tag").select();
 		new DefaultShell("Tag Image");
 		new LabeledText("New Tag:").setText(newTag);
 		new FinishButton().click();
@@ -78,7 +78,7 @@ public class DockerImage extends AbstractDockerExplorerItem {
 
 	public void run() {
 		select();
-		new ContextMenu("Run...").select();
+		new ContextMenu().getItem("Run...").select();
 	}
 
 }
\ No newline at end of file
diff --git a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
index 541f4af3bc..d79b5a57cd 100644
--- a/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
+++ b/containers/org.eclipse.linuxtools.docker.reddeer/src/org/eclipse/linuxtools/docker/reddeer/utils/BrowserContentsCheck.java
@@ -14,13 +14,13 @@ package org.eclipse.linuxtools.docker.reddeer.utils;
 import static org.junit.Assert.assertFalse;
 
 import org.eclipse.linuxtools.docker.reddeer.ui.BrowserView;
-import org.jboss.reddeer.common.condition.AbstractWaitCondition;
-import org.jboss.reddeer.common.matcher.RegexMatcher;
-import org.jboss.reddeer.common.wait.WaitWhile;
-import org.jboss.reddeer.core.condition.JobIsRunning;
-import org.jboss.reddeer.core.exception.CoreLayerException;
-import org.jboss.reddeer.eclipse.ui.browser.BrowserEditor;
-import org.jboss.reddeer.eclipse.ui.console.ConsoleView;
+import org.eclipse.reddeer.common.condition.AbstractWaitCondition;
+import org.eclipse.reddeer.common.matcher.RegexMatcher;
+import org.eclipse.reddeer.common.wait.WaitWhile;
+import org.eclipse.reddeer.workbench.core.condition.JobIsRunning;
+import org.eclipse.reddeer.core.exception.CoreLayerException;
+import org.eclipse.reddeer.eclipse.ui.browser.BrowserEditor;
+import org.eclipse.reddeer.eclipse.ui.console.ConsoleView;
 
 /**
  * 
diff --git a/releng/org.eclipse.linuxtools.docker-site/category.xml b/releng/org.eclipse.linuxtools.docker-site/category.xml
index 1531e4a9b7..9951a91d77 100644
--- a/releng/org.eclipse.linuxtools.docker-site/category.xml
+++ b/releng/org.eclipse.linuxtools.docker-site/category.xml
@@ -22,6 +22,41 @@
    <feature url="features/org.eclipse.linuxtools.vagrant.feature.source_0.0.0.qualifier.jar" id="org.eclipse.linuxtools.vagrant.feature.source" version="0.0.0">
       <category name="Linux Tools Sources"/>
    </feature>
+   <!-- Reddeer Dependencies -->
+   <iu id="org.eclipse.reddeer.common" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.core" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.eclipse" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.jface" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.junit.extension" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.junit" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.requirements" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.swt" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.ui" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.workbench" version="2.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+   <iu id="org.eclipse.reddeer.workbench.core" version="0.0.0">
+	<category name="Docker Test Dependencies"/>
+   </iu>
+
    <!-- Orbit Dependencies -->
    <iu id="com.spotify.docker.client" version="0.0.0">
         <category name="Docker Client Dependencies"/>
@@ -165,4 +200,9 @@
          Eclipse Linux Tools Docker Client Dependencies
       </description>
    </category-def>
+   <category-def name="Docker Test Dependencies" label="Docker Test Dependencies">
+      <description>
+         Eclipse Linux Tools Docker Integration Test Dependencies
+      </description>
+   </category-def>
 </site>
diff --git a/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target b/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target
index 970ea770a9..25b53b8ab9 100644
--- a/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target
+++ b/releng/org.eclipse.linuxtools.target/linuxtools-e4.7.target
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?><target name="linuxtools-e4.7" sequenceNumber="11">
+<?pde version="3.8"?><target name="linuxtools-e4.7" sequenceNumber="14">
 <locations>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.swtchart" version="0.10.0.v201605200358"/>
-<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
-<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
 <unit id="com.fasterxml.jackson.core.jackson-annotations" version="2.6.2.v20161117-2150"/>
 <unit id="com.fasterxml.jackson.core.jackson-core" version="2.6.2.v20161117-2150"/>
 <unit id="com.fasterxml.jackson.core.jackson-databind" version="2.6.2.v20161117-2150"/>
@@ -27,10 +24,16 @@
 <unit id="org.aopalliance" version="1.0.0.v201105210816"/>
 <unit id="org.apache.commons.codec" version="1.9.0.v20170208-1614"/>
 <unit id="org.apache.commons.compress" version="1.6.0.v201310281400"/>
+<unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
+<unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
+<unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
 <unit id="org.apache.httpcomponents.httpclient" version="4.5.2.v20170210-0925"/>
 <unit id="org.apache.httpcomponents.httpcore" version="4.4.6.v20170210-0925"/>
+<unit id="org.apache.xerces" version="2.9.0.v201101211617"/>
+<unit id="org.assertj" version="1.7.1.v20170413-2026"/>
 <unit id="org.bouncycastle.bcpkix" version="1.52.0.v20161004-1854"/>
 <unit id="org.bouncycastle.bcprov" version="1.52.0.v20161004-1854"/>
+<unit id="org.cyberneko.html" version="1.9.14.v201105210654"/>
 <unit id="org.glassfish.hk2.api" version="2.5.0.v20161103-0227"/>
 <unit id="org.glassfish.hk2.locator" version="2.5.0.v20161103-0227"/>
 <unit id="org.glassfish.hk2.osgi-resource-locator" version="2.5.0.v20161103-1916"/>
@@ -42,6 +45,7 @@
 <unit id="org.glassfish.jersey.core.jersey-server" version="2.22.1.v20161103-1916"/>
 <unit id="org.glassfish.jersey.ext.entityfiltering" version="2.22.1.v20161103-0227"/>
 <unit id="org.glassfish.jersey.media.jersey-media-json-jackson" version="2.22.1.v20161117-2005"/>
+<unit id="org.mockito" version="1.9.5.v201605172210"/>
 <unit id="org.objectweb.asm" version="5.2.0.v20170126-0011"/>
 <unit id="org.objectweb.asm.analysis" version="5.2.0.v20170126-0011"/>
 <unit id="org.objectweb.asm.tree" version="5.2.0.v20170126-0011"/>
@@ -52,20 +56,21 @@
 <unit id="org.apache.commons.lang" version="2.6.0.v201404270220"/>
 <unit id="org.apache.commons.io" version="2.2.0.v201405211200"/>
 <unit id="org.apache.commons.lang3" version="3.1.0.v201403281430"/>
+<unit id="org.swtchart" version="0.10.0.v201605200358"/>
 <repository location="http://download.eclipse.org/tools/orbit/downloads/drops/R20170516192513/repository/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.cdt.autotools.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.cdt.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.launchbar.feature.group" version="0.0.0"/>
 <repository location="http://download.eclipse.org/tools/cdt/releases/9.3"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.platform.ide" version="0.0.0"/>
-<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
 <unit id="org.eclipse.jdt.core" version="0.0.0"/>
 <unit id="org.eclipse.jdt.debug.ui" version="0.0.0"/>
 <unit id="org.eclipse.jdt.ui" version="0.0.0"/>
+<unit id="org.eclipse.platform.ide" version="0.0.0"/>
+<unit id="org.eclipse.pde.runtime" version="0.0.0"/>
 <repository location="http://download.eclipse.org/eclipse/updates/4.7"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
@@ -78,8 +83,8 @@
 <repository location="http://download.eclipse.org/cbi/updates/license"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.jgit.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.zest.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.tm.terminal.feature.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.remote.feature.group" version="0.0.0"/>
 <unit id="org.eclipse.dstore.core" version="0.0.0"/>
@@ -87,10 +92,10 @@
 <repository location="http://download.eclipse.org/releases/oxygen/"/>
 </location>
 <location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="true" type="InstallableUnit">
-<unit id="org.jboss.reddeer.junit.extension.feature.feature.group" version="1.2.1.Final"/>
-<unit id="org.jboss.reddeer.eclipse.feature.feature.group" version="1.2.1.Final"/>
-<unit id="org.jboss.reddeer.ui.feature.feature.group" version="1.2.1.Final"/>
-<repository location="http://download.jboss.org/jbosstools/neon/stable/updates/reddeer/1.2.1/"/>
+<unit id="org.eclipse.reddeer.eclipse.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.tests.feature.feature.group" version="0.0.0"/>
+<unit id="org.eclipse.reddeer.ui.feature.feature.group" version="0.0.0"/>
+<repository location="http://download.eclipse.org/reddeer/milestones/2.0.0.Beta"/>
 </location>
 </locations>
 <targetJRE path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>