diff --git a/org.fortiss.tooling.common.ui/trunk/.classpath b/org.fortiss.tooling.common.ui/trunk/.classpath
index d25099d0e00a86806a0465076e34639da90e4a45..e58bfccdaebc5166fa4d2bcae69af846839dbe77 100644
--- a/org.fortiss.tooling.common.ui/trunk/.classpath
+++ b/org.fortiss.tooling.common.ui/trunk/.classpath
@@ -3,6 +3,7 @@
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="external-src"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.conqat.ide.commons.gef.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/org.conqat.ide.commons.ui.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/jgrapht-jdk1.6_src.jar"/>
diff --git a/org.fortiss.tooling.common.ui/trunk/build.properties b/org.fortiss.tooling.common.ui/trunk/build.properties
index d86f9a84784e302c41ea0172642cdaa6cfce5afb..cd7a139199e0563abe5130d672bac57672f6bb11 100644
--- a/org.fortiss.tooling.common.ui/trunk/build.properties
+++ b/org.fortiss.tooling.common.ui/trunk/build.properties
@@ -7,6 +7,7 @@ bin.includes = .,\
                lib/jgrapht-jdk1.6_src.jar,\
                lib/swt-grouplayout.jar
 jars.compile.order = .
-source.. = src/
+source.. = src/,\
+           external-src/
 output.. = build/
 src.includes = lib/
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/.ratings b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/figures/.ratings
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/.ratings
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/figures/.ratings
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/figures/PolylineConnectionEx.java
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/figures/package.html
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/.ratings b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/.ratings
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/.ratings
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/.ratings
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/LineSeg.java
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/PointListUtilities.java
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/gmf/runtime/draw2d/ui/geometry/package.html
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/.ratings b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/ui/actions/.ratings
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/.ratings
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/ui/actions/.ratings
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/TextStyledTextActionHandler.java b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/ui/actions/TextStyledTextActionHandler.java
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/ui/actions/TextStyledTextActionHandler.java
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/ui/actions/TextStyledTextActionHandler.java
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/wb/swt/.ratings b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/wb/swt/.ratings
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/wb/swt/.ratings
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/wb/swt/.ratings
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/wb/swt/ResourceManager.java b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/wb/swt/ResourceManager.java
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/wb/swt/ResourceManager.java
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/wb/swt/ResourceManager.java
diff --git a/org.fortiss.tooling.common.ui/trunk/src/org/eclipse/wb/swt/SWTResourceManager.java b/org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/wb/swt/SWTResourceManager.java
similarity index 100%
rename from org.fortiss.tooling.common.ui/trunk/src/org/eclipse/wb/swt/SWTResourceManager.java
rename to org.fortiss.tooling.common.ui/trunk/external-src/org/eclipse/wb/swt/SWTResourceManager.java