This commit was manufactured by cvs2svn to create tag 'v200904151225'.
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.base.test.feature/.project b/features/org.eclipse.tigerstripe.workbench.ui.base.test.feature/.project
deleted file mode 100644
index 9476478..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.base.test.feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.workbench.ui.base.test.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/generators/XMLExportV2-0/.classpath b/generators/XMLExportV2-0/.classpath
deleted file mode 100644
index da6a272..0000000
--- a/generators/XMLExportV2-0/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/XMLExportV2-0/.project b/generators/XMLExportV2-0/.project
deleted file mode 100644
index 5583b99..0000000
--- a/generators/XMLExportV2-0/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>XMLExportV2-0</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.pluggablePluginProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripePluginProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/util/AbstractRunnable.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/util/AbstractRunnable.class
deleted file mode 100644
index 1d31490..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/util/AbstractRunnable.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/SingleArtiXMLCreator.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/SingleArtiXMLCreator.class
deleted file mode 100644
index 19b156b..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/SingleArtiXMLCreator.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.class
deleted file mode 100644
index ea039a1..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/workbench/xml/ArtifactToXML.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/workbench/xml/ArtifactToXML.class
deleted file mode 100644
index 0b9401c..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/workbench/xml/ArtifactToXML.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/resources/artifact.xsl b/generators/XMLExportV2-0/resources/artifact.xsl
deleted file mode 100644
index 9202a5f..0000000
--- a/generators/XMLExportV2-0/resources/artifact.xsl
+++ /dev/null
@@ -1,1224 +0,0 @@
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0">
-
-	<xsl:template match="/">
-		<html>
-			<body>
-				<p>
-					Project:
-					<xsl:value-of select="ts:tigerstripeProject/@name" />
-					Version:
-					<xsl:value-of select="ts:tigerstripeProject/@version" />
-				</p>
-				<xsl:if test="count(ts:tigerstripeProject/ts:annotations) &gt; 0">
-					<p>
-						<xsl:apply-templates select="ts:tigerstripeProject/ts:annotations"/><br/>
-					</p>
-				</xsl:if>
-				<xsl:if test="ts:tigerstripeProject/ts:comment">
-					<p>
-					
-					<xsl:apply-templates select="ts:tigerstripeProject/ts:comment" /><br/>
-				    </p>
-				</xsl:if>
-                <hr />				
-
-				<xsl:apply-templates select="ts:tigerstripeProject/ts:artifact"/>
-				
-
-			</body>
-		</html>
-	</xsl:template>
-	<xsl:template match="ts:artifact">
-	<font color="#FF6600">
-					<h2>
-						Artifact:
-						<xsl:value-of select="@name" />
-					</h2>
-				</font>
-				<p>
-					Artifact Type:
-					<xsl:value-of select="@artifactType" />
-				</p>
-				<xsl:if
-					test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IPackageArtifact'">
-					<p>
-						Extended Artifact:
-						<xsl:value-of
-							select="@extendedArtifact" />
-					</p>
-					<xsl:if
-						test="count(ts:implements/ts:implementedInterface) &gt; 0">
-						<p>Implemented Interfaces:</p>
-						<xsl:for-each
-							select="ts:implements/ts:implementedInterface">
-							<p>
-								<xsl:value-of select="." />
-							</p>
-						</xsl:for-each>
-					</xsl:if>
-					<p>
-						isAbstract:
-						<xsl:value-of select="@isAbstract" />
-					</p>
-				</xsl:if>
-				<xsl:if test="ts:comment">
-					<p>
-					
-					<xsl:apply-templates select="ts:comment" /><br/>
-				    </p>
-				</xsl:if>
-				
-
-				<xsl:if test="ts:stereotypes/ts:stereotype">
-                 <xsl:apply-templates select="ts:stereotypes"/><br/>
-                </xsl:if>
-                <xsl:if test="ts:annotations">
-                 <xsl:apply-templates select="ts:annotations"/><br/>
-                </xsl:if>
-
-
-
-
-
-				<!--enumerationSpecifics   -->
-
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-						<font color="#000099">
-							<h4>enumerationSpecifics</h4>
-						</font>
-						<p>
-							baseType:
-							<xsl:value-of select="ts:enumerationSpecifics/@baseType" />
-						</p>
-					</xsl:if>
-				
-
-
-				<!-- associationSpecifics and associationClassSpecifics-->
-
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' or
-                   @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-						<font color="#000099">
-							<h4>Association Specifics</h4>
-						</font>
-
-						<table border="1">
-							<tr>
-								<th>Name</th>
-								<th>End</th>
-								<th>Type</th>
-								<th>Multiplicity</th>
-								<th>Aggregation</th>
-								<th>Changeable</th>
-								<th>Navigable</th>
-								<th>Unique</th>
-								<th>Ordered</th>
-								<th>Visibility</th>
-							</tr>
-							<xsl:for-each select="ts:associationSpecifics/ts:associationEnd | ts:associationClassSpecifics/ts:associationEnd">
-								<tr>
-									<td>
-										<xsl:value-of select="@name" />
-									</td>
-									<td>
-										<xsl:value-of select="@end" />
-									</td>
-									<td>
-										<xsl:value-of select="@type" />
-									</td>
-									<td>
-										<xsl:value-of select="@multiplicity" />
-									</td>
-									<td>
-										<xsl:value-of select="@aggregation" />
-									</td>
-									<td>
-										<xsl:value-of select="@changeable" />
-									</td>
-									<td>
-										<xsl:value-of select="@navigable" />
-									</td>
-									<xsl:if
-										test="@multiplicity='0..*' or @multiplicity='1..*' or @multiplicity='*'">
-										<td>
-											<xsl:value-of select="@unique" />
-										</td>
-										<td>
-											<xsl:value-of select="@ordered" />
-										</td>
-									</xsl:if>
-									<xsl:if test="@multiplicity='0..1' or @multiplicity='0'">
-										<td>N/A</td>
-										<td>N/A</td>
-									</xsl:if>
-									<td>
-										<xsl:value-of select="@visibility" />
-									</td>
-								</tr>
-							</xsl:for-each>
-						</table>
-
-
-
-						<xsl:choose>
-							<xsl:when
-								test="count(ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0 or
-    count(ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-								<font color="#000099">
-									<h4>Association End Stereotypes</h4>
-								</font>
-								
-									
-
-										<table border="1">
-											<tr>
-												<th>Stereotype Name</th>
-												<th>End Name</th>
-												<th>Attribute Name</th>
-												<th>isArray</th>
-												<th>Value</th>
-											</tr>
-											<xsl:apply-templates select="ts:stereotype"/>
-											<xsl:for-each
-												select="ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype |
-												ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype">
-
-												<xsl:choose>
-													<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-														<xsl:variable name="row-span">
-															<xsl:value-of select="count(ts:stereotypeAttribute)" />
-														</xsl:variable>
-														<tr>
-															<td rowspan="{$row-span}">
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-														<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-															<tr>
-																<td>
-																	<xsl:value-of select="../../../@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@array" />
-																</td>
-																<td>
-																	<xsl:for-each select="ts:value">
-																		<p>
-																			<xsl:value-of select="." />
-																		</p>
-																	</xsl:for-each>
-																</td>
-															</tr>
-														</xsl:for-each>
-													</xsl:when>
-													<xsl:otherwise>
-														<tr>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:otherwise>
-												</xsl:choose>
-											</xsl:for-each>
-										</table>
-									</xsl:when>
-
-								
-								
-							
-							<xsl:otherwise>
-								<p>No Stereotypes</p>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:if>
-				
-
-
-
-				<!-- dependencySpecifics   -->
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact'">
-						<font color="#000099">
-							<h4>dependencySpecifics</h4>
-						</font>
-						<p>
-							aEndTypeName:
-							<xsl:value-of select="ts:dependencySpecifics/@aEndTypeName" />
-						</p>
-						<p>
-							zEndTypeName:
-							<xsl:value-of select="ts:dependencySpecifics/@zEndTypeName" />
-						</p>
-					</xsl:if>
-				
-
-				<!-- querySpecifics -->
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact'">
-						<font color="#000099">
-							<h4>querySpecifics</h4>
-						</font>
-						<p>
-							returnedTypeName:
-							<xsl:value-of select="ts:querySpecifics/@returnedTypeName" />
-						</p>
-						<p>
-							returnedTypeMultiplicity:
-							<xsl:value-of select="ts:querySpecifics/@returnedTypeMultiplicity" />
-						</p>
-					</xsl:if>
-				
-
-
-
-
-				<!-- Selecting only artifacts that support either Labels or Fields -->
-
-				
-					<xsl:if
-						test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IPackageArtifact'">
-
-
-						<!-- Constants  Literals -->
-
-						<xsl:if
-							test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact' and
-                      @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact'">
-
-							<font color="#FF6600">
-								<h3>Constants (Literals)</h3>
-							</font>
-							<xsl:if test="count(ts:literals/ts:literal) &gt; 0">
-								<table border="1">
-									<tr>
-										<th>Name</th>
-										<th>Type</th>
-										<th>Value</th>
-										<th>Visibility</th>
-										<th>Description</th>
-									</tr>
-									<xsl:for-each select="ts:literals/ts:literal">
-										<tr>
-											<td>
-												<xsl:value-of select="@name" />
-											</td>
-											<td>
-												<xsl:value-of select="@type" />
-											</td>
-											<td>
-												<xsl:value-of select="@value" />
-											</td>
-											<td>
-												<xsl:value-of select="@visibility" />
-											</td>
-											<td>
-												<xsl:value-of select="ts:comment" />
-											</td>
-										</tr>
-									</xsl:for-each>
-								</table>
-
-
-								<font color="#000099">
-									<h4>Constant Stereotypes</h4>
-								</font>
-								<xsl:choose>
-									<xsl:when
-										test="count(ts:literals/ts:literal/ts:stereotypes/ts:stereotype) &gt; 0">
-
-										<table border="1">
-											<tr>
-												<th>Stereotype Name</th>
-												<th>Constant name</th>
-												<th>Stereotype Attribute Name</th>
-												<th>isArray</th>
-												<th>Value</th>
-											</tr>
-											<xsl:for-each
-												select="ts:literals/ts:literal/ts:stereotypes/ts:stereotype">
-
-												<xsl:choose>
-													<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-														<xsl:variable name="row-span">
-															<xsl:value-of select="count(ts:stereotypeAttribute)" />
-														</xsl:variable>
-														<tr>
-															<td rowspan="{$row-span}">
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-														<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-															<tr>
-																<td>
-																	<xsl:value-of select="../../../@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@array" />
-																</td>
-																<td>
-																	<xsl:for-each select="ts:value">
-																		<p>
-																			<xsl:value-of select="." />
-																		</p>
-																	</xsl:for-each>
-																</td>
-															</tr>
-														</xsl:for-each>
-													</xsl:when>
-													<xsl:otherwise>
-														<tr>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:otherwise>
-												</xsl:choose>
-											</xsl:for-each>
-										</table>
-									</xsl:when>
-									<xsl:otherwise>
-										<p>No Stereotypes</p>
-									</xsl:otherwise>
-								</xsl:choose>
-
-							</xsl:if>
-
-							<xsl:if test="count(ts:literals/ts:literal) = 0">
-								<p>No constants</p>
-							</xsl:if>
-
-						</xsl:if>
-
-						<!-- Attributes  Fields -->
-
-						<xsl:if
-							test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-
-							<font color="#FF6600">
-								<h3>Attributes (Fields)</h3>
-							</font>
-							<xsl:if test="count(ts:fields/ts:field) &gt; 0">
-								<table border="1">
-									<tr>
-										<th>Name</th>
-										<th>Type</th>
-										<th>Multiplicity</th>
-										<th>Visibility</th>
-										<th>Readonly</th>
-										<th>Unique</th>
-										<th>Ordered</th>
-										<th>Default Value (optional)</th>
-										<th>Description</th>
-									</tr>
-									<xsl:for-each select="ts:fields/ts:field">
-										<tr>
-											<td>
-												<xsl:value-of select="@name" />
-											</td>
-											<td>
-												<xsl:value-of select="@type" />
-											</td>
-											<td>
-												<xsl:value-of select="@typeMultiplicity" />
-											</td>
-											<td>
-												<xsl:value-of select="@visibility" />
-											</td>
-											<td>
-												<xsl:value-of select="@readonly" />
-											</td>
-											<xsl:if
-												test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-												<td>
-													<xsl:value-of select="@unique" />
-												</td>
-												<td>
-													<xsl:value-of select="@ordered" />
-												</td>
-											</xsl:if>
-											<xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-												<td>N/A</td>
-												<td>N/A</td>
-											</xsl:if>
-											<td>
-												<xsl:value-of select="@defaultValue" />
-											</td>
-											<td>
-												<xsl:value-of select="ts:comment" />
-											</td>
-										</tr>
-									</xsl:for-each>
-								</table>
-
-								<font color="#000099">
-									<h4>Attribute Stereotypes</h4>
-								</font>
-								<xsl:choose>
-									<xsl:when
-										test="count(ts:fields/ts:field/ts:stereotypes/ts:stereotype) &gt; 0">
-										<table border="1">
-											<tr>
-												<th>Stereotype Name</th>
-												<th>Attribute Name</th>
-												<th>Stereotype Attribute Name</th>
-												<th>isArray</th>
-												<th>Value</th>
-											</tr>
-											<xsl:for-each
-												select="ts:fields/ts:field/ts:stereotypes/ts:stereotype">
-
-												<xsl:choose>
-													<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-														<xsl:variable name="row-span">
-															<xsl:value-of select="count(ts:stereotypeAttribute)" />
-														</xsl:variable>
-														<tr>
-															<td rowspan="{$row-span}">
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-														<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-															<tr>
-																<td>
-																	<xsl:value-of select="../../../@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@array" />
-																</td>
-																<td>
-																	<xsl:for-each select="ts:value">
-																		<p>
-																			<xsl:value-of select="." />
-																		</p>
-																	</xsl:for-each>
-																</td>
-															</tr>
-														</xsl:for-each>
-													</xsl:when>
-													<xsl:otherwise>
-														<tr>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:otherwise>
-												</xsl:choose>
-											</xsl:for-each>
-										</table>
-									</xsl:when>
-									<xsl:otherwise>
-										<p>No Stereotypes</p>
-									</xsl:otherwise>
-								</xsl:choose>
-
-
-							</xsl:if>
-							<xsl:if test="count(ts:fields/ts:field) = 0">
-								<p>No attributes</p>
-							</xsl:if>
-						</xsl:if>
-					</xsl:if>
-				
-
-
-
-				<!--       Methods        -->
-
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact' or 
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-
-						<font color="#FF6600">
-							<h3>Methods</h3>
-						</font>
-						<xsl:if test="count(ts:methods/ts:method) &gt; 0">
-							<table border="1">
-								<tr>
-									<th>Name</th>
-									<th>isAbstract</th>
-									<th>Unique</th>
-									<th>Ordered</th>
-									<th>isVoid</th>
-									<th>Type</th>
-									<th>Multiplicity</th>
-									<th>Visibility</th>
-									<th>Return Name</th>
-									<th>Default Value</th>
-									<th>Description</th>
-									<th>
-										Arguments
-										<small>(click on argument name to jump to argument
-											details)</small>
-									</th>
-									<th>Exceptions</th>
-								</tr>
-								<xsl:for-each select="ts:methods/ts:method">
-									<tr>
-										<td>
-											<xsl:value-of select="@name" />
-										</td>
-										<td>
-											<xsl:value-of select="@isAbstract" />
-										</td>
-										<xsl:if
-											test="@returnTypeMultiplicity='0..*' or @returnTypeMultiplicity='1..*' or @returnTypeMultiplicity='*'">
-											<td>
-												<xsl:value-of select="@unique" />
-											</td>
-											<td>
-												<xsl:value-of select="@ordered" />
-											</td>
-										</xsl:if>
-										<xsl:if
-											test="@returnTypeMultiplicity='0..1' or @returnTypeMultiplicity='0'">
-											<td>N/A</td>
-											<td>N/A</td>
-										</xsl:if>
-
-
-										<td>
-											<xsl:value-of select="@isVoid" />
-										</td>
-										<td>
-											<xsl:value-of select="@returnType" />
-										</td>
-
-										<td>
-											<xsl:value-of select="@returnTypeMultiplicity" />
-										</td>
-
-										<td>
-											<xsl:value-of select="@visibility" />
-										</td>
-										<td>
-											<xsl:value-of select="@methodReturnName" />
-										</td>
-										<td>
-											<xsl:value-of select="@defaultReturnValue" />
-										</td>
-										<td>
-											<xsl:value-of select="ts:comment" />
-										</td>
-										<xsl:variable name="arg-name">
-											<xsl:value-of select="ts:arguments/ts:argument/@name" />
-										</xsl:variable>
-										<xsl:variable name="method-name">
-											<xsl:value-of select="@name" />
-										</xsl:variable>
-
-										<a href="#{$arg-name}{$method-name}">
-											<td>
-												<xsl:for-each select="ts:arguments/ts:argument">
-
-													<font color="#FF6600">
-														<p>
-															<xsl:value-of select="@name" />
-														</p>
-													</font>
-
-												</xsl:for-each>
-											</td>
-										</a>
-
-										<td>
-											<xsl:for-each select="ts:exceptions/ts:exception">
-												<p>
-													<xsl:value-of select="@name" />
-												</p>
-											</xsl:for-each>
-										</td>
-									</tr>
-								</xsl:for-each>
-							</table>
-
-							<font color="#000099">
-								<h4>Method Stereotypes</h4>
-							</font>
-							<xsl:choose>
-								<xsl:when
-									test="count(ts:methods/ts:method/ts:stereotypes/ts:stereotype) &gt; 0">
-									<table border="1">
-										<tr>
-											<th>Stereotype Name</th>
-											<th>Method</th>
-											<th>Stereotype Attribute Name</th>
-											<th>isArray</th>
-											<th>Value</th>
-										</tr>
-										<xsl:for-each
-											select="ts:methods/ts:method/ts:stereotypes/ts:stereotype">
-
-											<xsl:choose>
-												<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-													<xsl:variable name="row-span">
-														<xsl:value-of select="count(ts:stereotypeAttribute)" />
-													</xsl:variable>
-													<tr>
-														<td rowspan="{$row-span}">
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-													<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-														<tr>
-															<td>
-																<xsl:value-of select="../../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:for-each>
-												</xsl:when>
-												<xsl:otherwise>
-													<tr>
-														<td>
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</table>
-								</xsl:when>
-								<xsl:otherwise>
-									<p>No Stereotypes</p>
-								</xsl:otherwise>
-							</xsl:choose>
-
-							<font color="#000099">
-								<h4>Method Return Stereotypes</h4>
-							</font>
-							<xsl:choose>
-								<xsl:when
-									test="count(ts:methods/ts:method/ts:returnStereotypes/ts:stereotype) &gt; 0">
-									<table border="1">
-										<tr>
-											<th>Stereotype Name</th>
-											<th>Method</th>
-											<th>Method Return Name</th>
-											<th>Stereotype Attribute Name</th>
-											<th>isArray</th>
-											<th>Value</th>
-										</tr>
-										<xsl:for-each
-											select="ts:methods/ts:method/ts:returnStereotypes/ts:stereotype">
-
-											<xsl:choose>
-												<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-													<xsl:variable name="row-span">
-														<xsl:value-of select="count(ts:stereotypeAttribute)" />
-													</xsl:variable>
-													<tr>
-														<td rowspan="{$row-span}">
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@methodReturnName" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-													<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-														<tr>
-															<td>
-																<xsl:value-of select="../../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:for-each>
-												</xsl:when>
-												<xsl:otherwise>
-													<tr>
-														<td>
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</table>
-								</xsl:when>
-								<xsl:otherwise>
-									<p>No Stereotypes</p>
-								</xsl:otherwise>
-							</xsl:choose>
-
-
-							<!--       Arguments        -->
-
-
-							<font color="#000099">
-								<h4> Arguments</h4>
-							</font>
-							<table border="1">
-								<tr>
-									<th>Name</th>
-									<th>Method</th>
-									<th>Type</th>
-									<th>Multiplicity</th>
-									<th>Unique</th>
-									<th>Ordered</th>
-									<th>Default Value (optional)</th>
-									<th>Description</th>
-
-								</tr>
-								<xsl:for-each select="ts:methods/ts:method/ts:arguments/ts:argument">
-									<tr>
-										<xsl:variable name="arg-name">
-											<xsl:value-of select="@name" />
-										</xsl:variable>
-										<xsl:variable name="method-name">
-											<xsl:value-of select="../../@name" />
-										</xsl:variable>
-										<td>
-											<a name="{$arg-name}{$method-name}">
-												<xsl:value-of select="@name" />
-											</a>
-										</td>
-										<td>
-											<xsl:value-of select="../../@name" />
-										</td>
-										<td>
-											<xsl:value-of select="@type" />
-										</td>
-										<td>
-											<xsl:value-of select="@typeMultiplicity" />
-										</td>
-										<xsl:if
-											test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-											<td>
-												<xsl:value-of select="@unique" />
-											</td>
-											<td>
-												<xsl:value-of select="@ordered" />
-											</td>
-										</xsl:if>
-										<xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-											<td>N/A</td>
-											<td>N/A</td>
-										</xsl:if>
-										<td>
-											<xsl:value-of select="@defaultValue" />
-										</td>
-										<td>
-											<xsl:value-of select="ts:comment" />
-										</td>
-
-									</tr>
-								</xsl:for-each>
-							</table>
-
-							<font color="#000099">
-								<h4>Argument Stereotypes</h4>
-							</font>
-							<xsl:choose>
-								<xsl:when
-									test="count(ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype) &gt; 0">
-									<table border="1">
-										<tr>
-											<th>Stereotype Name</th>
-											<th>Argument</th>
-											<th>Stereotype Attribute Name</th>
-											<th>isArray</th>
-											<th>Value</th>
-										</tr>
-										<xsl:for-each
-											select="ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype">
-
-											<xsl:choose>
-												<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-													<xsl:variable name="row-span">
-														<xsl:value-of select="count(ts:stereotypeAttribute)" />
-													</xsl:variable>
-													<tr>
-														<td rowspan="{$row-span}">
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-													<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-														<tr>
-															<td>
-																<xsl:value-of select="../../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:for-each>
-												</xsl:when>
-												<xsl:otherwise>
-													<tr>
-														<td>
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</table>
-								</xsl:when>
-								<xsl:otherwise>
-									<p>No Stereotypes</p>
-								</xsl:otherwise>
-							</xsl:choose>
-
-						</xsl:if>
-
-						<xsl:if test="count(ts:methods/ts:method) = 0">
-							<p>No methods</p>
-						</xsl:if>
-
-					</xsl:if>
-				
-				</xsl:template>
-				
-	<xsl:template match="ts:stereotypes">
-		<font color="#000099">
-			<h4>Stereotypes</h4>
-		</font>
-		<xsl:if test="count(ts:stereotype) &gt; 0">
-
-
-			<table border="1">
-				<tr>
-					<th>Stereotype Name</th>
-					<th>Attribute Name</th>
-					<th>isArray</th>
-					<th>Value</th>
-				</tr>
-				<xsl:apply-templates select="ts:stereotype"/>
-			</table>
-		</xsl:if>
-		<xsl:if test="count(ts:stereotype) = 0">
-			<p>No Stereotypes</p>
-		</xsl:if>
-	</xsl:template>
-
-	<xsl:template match="ts:annotations">
-		<font color="#000099">
-			<h4>Annotations</h4>
-		</font>
-		<p>
-			<xsl:value-of select="." />
-		</p>
-   </xsl:template>
-   
-   <xsl:template match="ts:comment">
-		<font color="#000099">
-			<h4>Description</h4>
-		</font>
-		<p>
-			<xsl:value-of select="." />
-		</p>
-   </xsl:template>
-   
-                       <xsl:template match="ts:stereotype">
-                       <xsl:choose>
-						<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-							<xsl:variable name="row-span">
-								<xsl:value-of select="count(ts:stereotypeAttribute)" />
-							</xsl:variable>
-							<tr>
-								<td rowspan="{$row-span}">
-									<xsl:value-of select="@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-								</td>
-								<td>
-									<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-										<p>
-											<xsl:value-of select="." />
-										</p>
-									</xsl:for-each>
-								</td>
-							</tr>
-							<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-								<tr>
-									<td>
-										<xsl:value-of select="@name" />
-									</td>
-									<td>
-										<xsl:value-of select="@array" />
-									</td>
-									<td>
-										<xsl:for-each select="ts:value">
-											<p>
-												<xsl:value-of select="." />
-											</p>
-										</xsl:for-each>
-									</td>
-								</tr>
-							</xsl:for-each>
-						</xsl:when>
-						<xsl:otherwise>
-							<tr>
-								<td>
-									<xsl:value-of select="@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute/@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute/@array" />
-								</td>
-								<td>
-									<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-										<p>
-											<xsl:value-of select="." />
-										</p>
-									</xsl:for-each>
-								</td>
-							</tr>
-						</xsl:otherwise>
-					</xsl:choose>
-					</xsl:template>
-
-</xsl:stylesheet>
diff --git a/generators/XMLExportV2-0/resources/index.xsl b/generators/XMLExportV2-0/resources/index.xsl
deleted file mode 100644
index eda81af..0000000
--- a/generators/XMLExportV2-0/resources/index.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0">
-
-<xsl:template match="/">
- <html>
-    
-
-    <body>
-    <h2>Artifacts within Project: <xsl:value-of select="ts:tigerstripeProject/@name"/>
-        Version: <xsl:value-of select="ts:tigerstripeProject/@version"/></h2>
-    <hr/>
-    <p/>
-    
-
-    <table border="1">
-    <tr bgcolor="#9acd32">
-      <th align="left">Artifact Name</th>
-      <th align="left">Type</th>
-    </tr>
-    <xsl:for-each select="ts:tigerstripeProject/ts:artifactFile">
-    <xsl:sort select="@name"/>
-    <xsl:variable name="file-name"><xsl:value-of select="@fileName"/></xsl:variable>
-    <tr>    
-      <td><a href="{$file-name}" target="_blank"><xsl:value-of select="@name"/></a></td>   
-      <td><xsl:value-of select="@artifactType"/></td>
-    </tr>
-    </xsl:for-each>
-    </table>
-    <br/>
-    
-  </body>
-
-  </html>
-  
- 
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/generators/XMLExportV2-0/resources/tigerstripeExportSchema-v2-0.xsd b/generators/XMLExportV2-0/resources/tigerstripeExportSchema-v2-0.xsd
deleted file mode 100644
index 5536c19..0000000
--- a/generators/XMLExportV2-0/resources/tigerstripeExportSchema-v2-0.xsd
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:tns="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0" 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0" 
-	elementFormDefault="qualified" 
-	version="1.1">
-	
-	<xs:element name="annotations" type="xs:string"/>
-	
-	<xs:complexType  name="annotatedType">
-		<xs:sequence>
-			<xs:element ref="tns:annotations" minOccurs="0" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:element name="tigerstripeProject">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-					<xs:sequence>
-						<xs:element name="comment" type="xs:string" minOccurs="0"/>
-						<xs:choice>
-							<xs:element ref="tns:artifact" minOccurs="0" maxOccurs="unbounded"/>
-							<xs:element ref="tns:artifactFile" minOccurs="0" maxOccurs="unbounded"/>
-						</xs:choice>
-					</xs:sequence>
-					<xs:attribute name="name" type="xs:string" use="required"/>
-					<xs:attribute name="version" type="xs:string" use="required"/>
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifact">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-       			<xs:sequence>
-				<xs:element ref="tns:implements" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:literals" minOccurs="0"/>
-				<xs:element ref="tns:fields" minOccurs="0"/>
-				<xs:element ref="tns:methods" minOccurs="0"/>
-				<xs:choice>
-					<xs:element ref="tns:enumerationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationClassSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:dependencySpecifics" minOccurs="0"/>
-					<xs:element ref="tns:querySpecifics" minOccurs="0"/>
-				</xs:choice>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="extendedArtifact" type="xs:string" use="optional"/>
-			<xs:attribute name="artifactType" type="xs:string" use="required"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="optional"/>
-			</xs:extension>
-            </xs:complexContent>
-			<!-- The name and extendedArtifact are the FQNs of the artifacts not the simple name -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifactFile">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="artifactType" type="xs:string" use="optional"/>
-			<xs:attribute name="fileName" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="fields">
-		<xs:complexType>	             
-			<xs:sequence>
-				<xs:element ref="tns:field" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="field">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="readonly" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-		    </xs:extension>
-            </xs:complexContent>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literals">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:literal" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literal">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="value" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="methods">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:method" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="method">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:arguments" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element ref="tns:returnStereotypes" minOccurs="0"/>
-				<xs:element ref="tns:exceptions" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="returnType" type="xs:string" use="optional"/>
-			<xs:attribute name="returnTypeMultiplicity" type="xs:string" use="optional"/>
-			<xs:attribute name="isVoid" type="xs:boolean" use="required"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultReturnValue" type="xs:string" use="optional"/>
-			<xs:attribute name="methodReturnName" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="arguments">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:argument" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="argument">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-			<xs:attribute name="direction" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exceptions">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:exception" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exception">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<!-- The value in name is the FQN -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="returnStereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotype">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypeAttribute" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypeAttribute">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="array" type="xs:boolean" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="implements">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="implementedInterface" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Specific content for each Artifact Type -->
-	<xs:element name="enumerationSpecifics">
-		<xs:complexType>
-			<xs:attribute name="baseType" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Note, the two associationEnds are AEnd and ZEnd -->
-	<xs:element name="associationEnd">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="end" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="multiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="aggregation" type="xs:string" use="required"/>
-			<xs:attribute name="changeable" type="xs:string" use="required"/>
-			<xs:attribute name="navigable" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<!-- the value for "end" cannot be extracted from the model and so is set in the template -->
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationClassSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="dependencySpecifics">
-		<xs:complexType>
-			<xs:attribute name="aEndTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="zEndTypeName" type="xs:string" use="required"/>
-			<!-- The value in EndTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="querySpecifics">
-		<xs:complexType>
-			<xs:attribute name="returnedTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="returnedTypeMultiplicity" type="xs:string" use="required"/>
-			<!-- The value in returnedTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/util/AbstractRunnable.java b/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/util/AbstractRunnable.java
deleted file mode 100644
index 25df88e..0000000
--- a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/util/AbstractRunnable.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    R. Craddock (Cisco Systems, Inc.)
- *******************************************************************************/
-package org.eclipse.tigerstripe.generators.util;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IExpander;
-import org.eclipse.tigerstripe.workbench.plugins.IRule;
-import org.eclipse.tigerstripe.workbench.plugins.IRuleReport;
-import org.eclipse.tigerstripe.workbench.plugins.IRunnableWrapper;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
-
-
-
-public abstract class AbstractRunnable implements IRunnableWrapper{
-
-	protected Map<String, Object> context ;
-
-	protected IRuleReport report = null;
-	protected IPluginConfig config = null;
-	protected ITigerstripeModelProject modelProject = null;
-	protected IExpander exp;
-		
-
-	public String makeFileName() throws TigerstripeException {
-		String base = "";
-		String target = "";
-		String file = "";
-		String dir = "";
-		
-		
-		base = modelProject.getLocation().toString();
-		target = modelProject.getProjectDetails().getOutputDirectory();
-		
-		String f = exp.expandVar(config.getProperty("fileName").toString());
-		f= checkValidDirectory(f,"fileName");
-		file = exp.expandVar(f);
-		String d = exp.expandVar(config.getProperty("xmlDir").toString());
-		d = checkValidDirectory(d,"xmlDir");
-		dir = exp.expandVar(d);
-		File dirs = new File(base+File.separator+
-				  target+File.separator+
-				  dir);
-		dirs.mkdirs();
-		
-		String fullFileName = base+File.separator+
-							  target+File.separator+
-							  dir+File.separator+
-							  file;
-		return fullFileName;
-	}
-	
-	private String checkValidDirectory(String d, String source){
-		char[] illegalCharacters = {'/', '?', '\\', ':', '*','>','<','"','|'};		
-	    for(int i = 0; i < d.length(); i++){
-	    	for(char illegal : illegalCharacters){
-	    		if(d.charAt(i) == illegal){
-	    			PluginLog.logWarning("WARNING: Configured "+source+" ("+d+") is illegal default will be used instead.");
-	    			return getDefault(source);
-	    		}
-	    	}
-	    }	    	
-		return d;
-	}
-	
-	protected String checkValidXSLFileName(String d, String source){
-		 Pattern p = Pattern.compile(".*\\.xsl[t]??");
-		 Matcher m = p.matcher(d);
-		 if(!m.matches()){
-			 PluginLog.logWarning("WARNING: Configured "+source+" ("+d+") not valid as not end with .xsl[t]. Default used.");
-			 return getDefault(source);
-		 }
-		return d = checkValidDirectory(d,source);
-	}
-	
-	private String getDefault(String source){
-		if(source.equalsIgnoreCase("xmlDir"))return "xmlExport";
-		else if(source.equalsIgnoreCase("indexXSL")) return "index.xsl";
-		else if(source.equalsIgnoreCase("artifactXSL")) return "artifact.xsl";
-		else if(source.equalsIgnoreCase("fileName")) return "${project.Name}.xml";
-		else return "no default";
-	}
-	
-	public String makeSingleArtiFileName(IAbstractArtifact artifact) throws TigerstripeException{
-		String base = "";
-		String target = "";
-		String file = "";
-		String extension = ".xml";
-		String path = "";
-		String dir = "";
-		
-		base = modelProject.getLocation().toString();
-		target = modelProject.getProjectDetails().getOutputDirectory();
-		String d = exp.expandVar(config.getProperty("xmlDir").toString());
-		d = checkValidDirectory(d,"xmlDir");
-		dir = exp.expandVar(d);
-		path = base+File.separator+target+File.separator+dir+File.separator+artifact.getPackage().replace(".", File.separator);
-		File dirs = new File(path);
-		dirs.mkdirs();
-		
-		String fullFileName = path+File.separator+artifact.getName()+extension;
-		PluginLog.logDebug("This is the file name: "+ fullFileName);
-		return fullFileName;
-	}
-	
-	
-	
-	public void setContext(Map<String, Object> arg0) {
-		this.context = arg0;
-		PluginLog.logInfo("Setting context");
-		
-		Object rpt = context.get(IRule.REPORT);
-		if (rpt instanceof IRuleReport){
-			this.report = (IRuleReport) rpt;
-			PluginLog.logTrace("Report : "+this.report);
-		}
-		
-		Object pluginConfig = context.get(IRule.PLUGINCONFIG);
-		if (pluginConfig instanceof IPluginConfig){
-			
-			config = (IPluginConfig) pluginConfig;
-			PluginLog.logTrace("Got plugin Config");
-			
-		}
-		Object proj = context.get(IRule.TSPROJECTHANDLE);
-		if (proj instanceof ITigerstripeModelProject){
-			modelProject = (ITigerstripeModelProject) proj;
-			PluginLog.logTrace("Got model project");
-		}
-		
-		exp = (IExpander) context.get(IRule.EXP);
-	}
-
-	public IRuleReport getReport() {
-		return report;
-	}
-	
-	public IPluginConfig getConfig() {
-		return config;
-	}
-	
-	/**
-	 * Save the package to a Resource.
-	 * 
-	 * @param package_
-	 * @param uri
-	 */
-	@SuppressWarnings("unchecked")	
-       public void save(String fileName,String contents ) {
-	    
-	    File file = new File(fileName);
-	    Object ovw = context.get(IRule.OVERWRITEFILES);
-	    boolean isOverwriteFiles = false;
-	    if (ovw instanceof Boolean){
-	    	isOverwriteFiles = (Boolean) ovw;
-	    	PluginLog.logDebug("IsOverwriteFiles "+Boolean.toString(isOverwriteFiles));
-	    }
-
-		try {
-			PrintWriter out = new PrintWriter(new FileWriter(file));
-			out.println(contents);
-			out.close();
-			PluginLog.logInfo("Export complete. "+file);
-			getReport().getGeneratedFiles().add(file.toString());
-		} catch (IOException ioe) {
-			PluginLog.logError("Export failed to save. " + file, ioe);
-		}
-	}
-	
-}
diff --git a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.java b/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.java
deleted file mode 100644
index 0d8e9f7..0000000
--- a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    D. Keysell (Cisco Systems, Inc.)
- *******************************************************************************/
-package org.eclipse.tigerstripe.generators.xml.v2;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.tigerstripe.generators.util.AbstractRunnable;
-import org.eclipse.tigerstripe.workbench.internal.core.model.importing.xml.ArtifactToXML;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IRule;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.ProcessingInstruction;
-
-
-public class XMLCreator extends AbstractRunnable{
-
-		
-	public void run() throws Exception {
-		Object artifactsObj = context.get(IRule.ARTIFACTS);
-		Collection<IAbstractArtifact> artifacts = (Collection<IAbstractArtifact>) artifactsObj;
-		String f = exp.expandVar(config.getProperty("singleFileOnly").toString());
-		DocumentBuilderFactory dbf = null;
-		
-		try {
-			// Make a XML document containing the various components of the pattern
-			dbf = DocumentBuilderFactory.newInstance();
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-			DocumentBuilder db = dbf.newDocumentBuilder();
-			Document document = db.newDocument();
-			TransformerFactory tf = TransformerFactory.newInstance();
-			Transformer t = tf.newTransformer();
-			t.setOutputProperty(OutputKeys.INDENT, "yes");
-			
-			ArtifactToXML artifactToXML = new ArtifactToXML(document);
-			
-			Element rootElement = artifactToXML.getRootElement(modelProject);
-			PluginLog.logDebug(rootElement.toString());
-			document.appendChild(rootElement);
-			
-			
-			
-			
-			if(f.equalsIgnoreCase("false")){
-			String indexXSLStart = "href=\"./";
-			String ix = exp.expandVar(config.getProperty("indexXSL").toString());
-			ix = checkValidXSLFileName(ix, "indexXSL");
-		    String indexXSL = indexXSLStart.concat(ix).concat("\" type=\"text/xsl\"");
-			ProcessingInstruction xslt = document.createProcessingInstruction("xml-stylesheet", indexXSL);
-			document.insertBefore(xslt, rootElement);
-			for (IAbstractArtifact artifact : artifacts){
-				Element artifactElement = artifactToXML.artifactToIndexElement(artifact);
-				rootElement.appendChild(artifactElement);
-			}
-			} else {					
-			for (IAbstractArtifact artifact : artifacts){
-				Element artifactElement = artifactToXML.artifactToElement(artifact);
-				rootElement.appendChild(artifactElement);
-			}
-			}
-			
-			
-			DOMSource source = new DOMSource(document);
-			StringWriter sw = new StringWriter();
-			StreamResult sr = new StreamResult(sw);
-			t.transform(source, sr);
-			
-			// Now write it to the file
-			
-			
-			save(makeFileName(),sw.toString());
-		
-			
-			if(f.equalsIgnoreCase("false")){
-				for (IAbstractArtifact arti : artifacts){
-					Document artiDocument = db.newDocument();
-					ArtifactToXML aartifactToXML = new ArtifactToXML(artiDocument);
-					
-					String toRoot = pathToRoot(arti.getFullyQualifiedName());
-					String ax = exp.expandVar(config.getProperty("artifactXSL").toString());
-					String end = "\" type=\"text/xsl\"";
-					String transform = "href=\"".concat(toRoot).concat(ax).concat(end);
-					ProcessingInstruction xslt = artiDocument.createProcessingInstruction("xml-stylesheet", transform);
-					
-					Element arootElement = aartifactToXML.getRootElement(modelProject);					
-					artiDocument.appendChild(arootElement);
-					artiDocument.insertBefore(xslt, arootElement);
-					
-					
-					
-					Element artifactElement = aartifactToXML.artifactToElement(arti);					
-					arootElement.appendChild(artifactElement);
-					
-					
-					DOMSource asource = new DOMSource(artiDocument);
-					StringWriter asw = new StringWriter();
-					StreamResult asr = new StreamResult(asw);
-					t.transform(asource, asr);
-					
-					// Now write it to the file
-					
-					
-					save(makeSingleArtiFileName(arti),asw.toString());
-					}
-				}
-			
-		
-		}
-					
-		
-		
-	
-	public String pathToRoot(String inString){
-		String[] bits = inString.split("\\.");
-		//PluginLog.logDebug("String in: "+inString+", lenght of bits :"+bits.length);
-		String outString = "";
-		if(bits.length!=1){
-		for(int i=0; i<(bits.length-1); i++){
-			outString = outString + "../";
-		}
-		return outString;
-		}
-		else return "./";
-	}
-	
-}
diff --git a/generators/XMLExportV2-0/ts-plugin.xml b/generators/XMLExportV2-0/ts-plugin.xml
deleted file mode 100644
index d25710a..0000000
--- a/generators/XMLExportV2-0/ts-plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts_plugin version="1.2">
-<project name="">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>1</version>
-<description>Generates either a single file containing an XML export of all the project (global setting singleFileOnly = true) or an index page and one XML export file per artifact (global setting singleFileOnly = false).&#13;
-Also the XML schema for the generated XML is copied to the output in the model project.&#13;
-In the singleFileOnly  = false mode a processing instruction pointing to XSL is added to each XML file. These XSL files are also copied to the output of the model project. The XSL convert the XML export to HTML pages for model documentation.</description>
-<provider>Cisco Systems</provider>
-<property name="defaultArtifactPackage">com.mycompany</property>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="4" isEnabled="true" logPath="XMLExportV2-0.log" maxRoll="9"/>
-<globalProperties>
-<property name="fileName" tipToolText="File Name of the single export file or index file in one file per artifact mode." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">${project.Name}.xml</property>
-<property name="xmlDir" tipToolText="Directory to which export xml files are generated" type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">xmlExport</property>
-<property name="singleFileOnly" tipToolText="Create single XML file only (true) or one per artifact in addition to the single file (false)." type="org.eclipse.tigerstripe.workbench.plugins.IBooleanPluginProperty">true</property>
-<property name="indexXSL" tipToolText="XSL file used to generate index page." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">index.xsl</property>
-<property name="artifactXSL" tipToolText="XSL used to generate artifact detail pages." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">artifact.xsl</property>
-</globalProperties>
-<globalRules>
-<rule description="Will either create a single file containing an XML export of all the project (global setting singleFileOnly = true) or an index page and one XML export file per artifact (global setting singleFileOnly = false)." enabled="true" name="allArtifactInOneFile" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalRunnableRule">
-<body overwriteFiles="true" runnableClassName="org.eclipse.tigerstripe.generators.xml.v2.XMLCreator" suppressFiles="false"/>
-</rule>
-<rule description="Copies the XML export schema and XSLT files to the model project output." enabled="true" name="copyResources" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\*" toDirectory="${ppProp.xmlDir}\"/>
-</rule>
-</globalRules>
-<artifactRules/>
-<classpathEntries/>
-<additionalFiles>
-<includeEntry relativePath="resources/"/>
-</additionalFiles>
-<advanced/>
-<annotationPlugins/>
-</ts_plugin>
diff --git a/generators/export-xml/.classpath b/generators/export-xml/.classpath
deleted file mode 100644
index 1273e5f..0000000
--- a/generators/export-xml/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/export-xml/.cvsignore b/generators/export-xml/.cvsignore
deleted file mode 100644
index 90b07e9..0000000
--- a/generators/export-xml/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-classes
diff --git a/generators/export-xml/.project b/generators/export-xml/.project
deleted file mode 100644
index b7e94e3..0000000
--- a/generators/export-xml/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>export-xml</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.pluggablePluginProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripePluginProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/export-xml/resources/artifact_converter.xsl b/generators/export-xml/resources/artifact_converter.xsl
deleted file mode 100644
index eeffe69..0000000
--- a/generators/export-xml/resources/artifact_converter.xsl
+++ /dev/null
@@ -1,871 +0,0 @@
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-xmlns:tsa="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0">
-
-<xsl:template match="/">
-  <html>
-  <body>
-    <p>Project: <xsl:value-of select="tsa:projectArtifact/@projectName"/>
- Version: <xsl:value-of select="tsa:projectArtifact/@projectVersion"/></p>
-
-<hr/>
-
-    <font color="#FF6600">
-     <h2>Artifact: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@name"/></h2>
-    </font>
-    <p>Artifact Type: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@artifactType"/></p>
-    <p>Extended Artifact: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@extendedArtifact"/></p>
-    <xsl:if test="count(tsa:projectArtifact/ts:artifact/ts:implements/ts:implementedInterface) &gt; 0">
-    <p>Implemented Interfaces:</p>
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact/ts:implements/ts:implementedInterface">
-    <p>    <xsl:value-of select="."/></p>
-    </xsl:for-each>
-    </xsl:if>
-    <p>isAbstract: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@isAbstract"/></p>
-    <p>Description: <xsl:value-of select="tsa:projectArtifact/ts:artifact/ts:comment"/></p>
-    
-    
-    <font color="#000099">
-     <h4>Annotations</h4>
-    </font>
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-    <xsl:if test="count(ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-            
-            
-            </xsl:for-each>                              
-            </table>
-            </xsl:if>
-            <xsl:if test="count(ts:stereotypes/ts:stereotype) = 0">
-            <p>No annotations</p>
-            </xsl:if>
-            </xsl:for-each>
-
-      
-        <!--enumerationSpecifics   -->
-    
-     <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-      <font color="#000099">
-       <h4>enumerationSpecifics</h4>
-      </font>
-      <p>baseType: <xsl:value-of select="ts:enumerationSpecifics/@baseType"/></p>
-      </xsl:if>
-      </xsl:for-each>
-      
-      
-       <!-- associationSpecifics and associationClassSpecifics-->
-    
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' or
-                   @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-      <font color="#000099">
-       <h4>Association Specifics</h4>
-      </font>
-      
-      <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>End</th>
-            <th>Type</th>
-            <th>Multiplicity</th>
-            <th>Aggregation</th>
-            <th>Changeable</th>
-            <th>Navigable</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>Visibility</th>
-            </tr>
-         <xsl:for-each select="ts:associationSpecifics/ts:associationEnd">
-         <tr>
-          <td><xsl:value-of select="@name"/></td>
-          <td><xsl:value-of select="@end"/></td>
-          <td><xsl:value-of select="@type"/></td>
-          <td><xsl:value-of select="@multiplicity"/></td>
-          <td><xsl:value-of select="@aggregation"/></td>
-          <td><xsl:value-of select="@changeable"/></td>
-          <td><xsl:value-of select="@navigable"/></td>
-          <xsl:if test="@multiplicity='0..*' or @multiplicity='1..*' or @multiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-          </xsl:if>
-          <xsl:if test="@multiplicity='0..1' or @multiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-          </xsl:if>
-            <td><xsl:value-of select="@visibility"/></td>
-         </tr>
-         </xsl:for-each>
-         <xsl:for-each select="ts:associationClassSpecifics/ts:associationEnd">
-         <tr>
-          <td><xsl:value-of select="@name"/></td>
-          <td><xsl:value-of select="@end"/></td>
-          <td><xsl:value-of select="@type"/></td>
-          <td><xsl:value-of select="@multiplicity"/></td>
-          <td><xsl:value-of select="@aggregation"/></td>
-          <td><xsl:value-of select="@changeable"/></td>
-          <td><xsl:value-of select="@navigable"/></td>
-          <xsl:if test="@multiplicity='0..*' or @multiplicity='1..*' or @multiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-          </xsl:if>
-          <xsl:if test="@multiplicity='0..1' or @multiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-          </xsl:if>
-          <td><xsl:value-of select="@visibility"/></td>
-         </tr>
-         </xsl:for-each>
-       </table>
-      
-      
-          
-    <xsl:choose>
-    <xsl:when test="count(ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0 or
-    count(ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-    <font color="#000099">
-     <h4>Association End Annotations</h4>
-    </font>
-    <xsl:choose>
-    <xsl:when test="count(ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-    
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Constant</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-        </xsl:when>
-      
-      </xsl:choose>
-      <xsl:choose>
-    <xsl:when test="count(ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-    
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Constant</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-        </xsl:when>
-      
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <p>No annotations</p>
-      </xsl:otherwise>
-    </xsl:choose>
-    </xsl:if>
-    </xsl:for-each>
-    
-    
-      
-      <!-- dependencySpecifics   -->
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact'">
-      <font color="#000099">
-       <h4>dependencySpecifics</h4>
-      </font>
-      <p>aEndTypeName: <xsl:value-of select="ts:dependencySpecifics/@aEndTypeName"/></p>
-      <p>zEndTypeName: <xsl:value-of select="ts:dependencySpecifics/@zEndTypeName"/></p>
-      </xsl:if>
-      </xsl:for-each>
-      
-      <!-- querySpecifics -->
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact'">
-      <font color="#000099">
-       <h4>querySpecifics</h4>
-      </font>
-      <p>returnedTypeName: <xsl:value-of select="ts:querySpecifics/@returnedTypeName"/></p>
-      <p>returnedTypeMultiplicity: <xsl:value-of select="ts:querySpecifics/@returnedTypeMultiplicity"/></p>
-      </xsl:if>
-     </xsl:for-each>
-      
-          
-
-
-      <!-- Selecting only artifacts that support either Labels or Fields -->
-
-      <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-      <xsl:if test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact'">
-
-
-              <!-- Constants  Literals -->
-     
-        <xsl:if test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact' and
-                      @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact'">
-           
-        <font color="#FF6600">
-         <h3>Constants (Literals)</h3>
-        </font>
-        <xsl:if test="count(ts:literals/ts:literal) &gt; 0">
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Value</th>
-            <th>Visibility</th>
-            <th>Description</th>
-            </tr>
-            <xsl:for-each select="ts:literals/ts:literal">
-            <tr>
-            <td><xsl:value-of select="@name"/></td>
-            <td><xsl:value-of select="@type"/></td>
-            <td><xsl:value-of select="@value"/></td>
-             <td><xsl:value-of select="@visibility"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            </tr>
-            </xsl:for-each>
-            </table>
-            
-
-    <font color="#000099">
-     <h4>Constant Annotations</h4>
-    </font>
-    <xsl:choose>
-    <xsl:when test="count(ts:literals/ts:literal/ts:stereotypes/ts:stereotype) &gt; 0">
-    
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Constant</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:literals/ts:literal/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-        </xsl:when>
-      <xsl:otherwise>
-      <p>No annotations</p>
-      </xsl:otherwise>
-      </xsl:choose>
-
-       </xsl:if>
-        
-       <xsl:if test="count(ts:literals/ts:literal) = 0">
-       <p>No constants</p>
-       </xsl:if>
-            
-       </xsl:if>
-
-              <!-- Attributes  Fields -->
-
-        <xsl:if test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-
-        <font color="#FF6600">
-         <h3>Attributes (Fields)</h3>
-        </font>
-        <xsl:if test="count(ts:fields/ts:field) &gt; 0">
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Multiplicity</th>
-            <th>Visibility</th>
-            <th>Readonly</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>Default Value (optional)</th>
-            <th>Description</th>
-            </tr>
-            <xsl:for-each select="ts:fields/ts:field">
-            <tr>
-            <td><xsl:value-of select="@name"/></td>
-            <td><xsl:value-of select="@type"/></td>
-            <td><xsl:value-of select="@typeMultiplicity"/></td>
-             <td><xsl:value-of select="@visibility"/></td>
-            <td><xsl:value-of select="@readonly"/></td>
-            <xsl:if test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-            </xsl:if>
-            <xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-            </xsl:if>
-            <td><xsl:value-of select="@defaultValue"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            </tr>
-            </xsl:for-each>
-            </table>
-
-<font color="#000099">
- <h4>Attribute Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:fields/ts:field/ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Attribute</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:fields/ts:field/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-     
-     </xsl:if>
-     </xsl:if>
-     <xsl:if test="count(ts:fields/ts:field) = 0">
-     <p>No attributes</p>
-     </xsl:if>
-     </xsl:if>
-     </xsl:for-each>
-     
-     
-
-              <!--       Methods        -->
-              
-        <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-        <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact' or 
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-        
-        <font color="#FF6600">
-         <h3>Methods</h3>
-        </font>
-           <xsl:if test="count(ts:methods/ts:method) &gt; 0">
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>isAbstract</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>isVoid</th>
-            <th>Type</th>            
-            <th>Multiplicity</th>            
-            <th>Visibility</th>
-            <th>Return Name</th>
-            <th>Default Value</th>
-            <th>Description</th>
-            <th>Arguments <small>(click on argument name to jump to argument details)</small></th>
-            <th>Exceptions</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method">
-            <tr>
-            <td><xsl:value-of select="@name"/></td>
-            <td><xsl:value-of select="@isAbstract"/></td>
-            <xsl:if test="@returnTypeMultiplicity='0..*' or @returnTypeMultiplicity='1..*' or @returnTypeMultiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-            </xsl:if>
-            <xsl:if test="@returnTypeMultiplicity='0..1' or @returnTypeMultiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-            </xsl:if>
-            
-            
-            <td><xsl:value-of select="@isVoid"/></td>
-            <td><xsl:value-of select="@returnType"/></td>
-            
-            <td><xsl:value-of select="@returnTypeMultiplicity"/></td>
-            
-             <td><xsl:value-of select="@visibility"/></td>
-            <td><xsl:value-of select="@methodReturnName"/></td>
-            <td><xsl:value-of select="@defaultReturnValue"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            <xsl:variable name="arg-name"><xsl:value-of select="ts:arguments/ts:argument/@name"/></xsl:variable>            
-            <xsl:variable name="method-name"><xsl:value-of select="@name"/></xsl:variable>
-            
-              <a href="#{$arg-name}{$method-name}">            
-                <td>
-                  <xsl:for-each select="ts:arguments/ts:argument">
-                  
-                    <font color="#FF6600"><p><xsl:value-of select="@name"/></p></font>
-                    
-                   </xsl:for-each>
-                </td>
-              </a>
-            
-            <td><xsl:for-each select="ts:exceptions/ts:exception"><p><xsl:value-of select="@name"/></p></xsl:for-each></td>
-            </tr>
-            </xsl:for-each>
-            </table>
-
-<font color="#000099">
- <h4>Method Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:methods/ts:method/ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Method</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-  
-<font color="#000099">
- <h4>Method Return Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:methods/ts:method/ts:returnStereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Method</th>
-            <th>Method Return Name</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:returnStereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="../../@methodReturnName"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-
-
-              <!--       Arguments        -->
-
-
-        <font color="#000099">
-         <h4>   Arguments</h4>
-        </font>
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>Method</th>
-            <th>Type</th>
-            <th>Multiplicity</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>Default Value (optional)</th>
-            <th>Description</th>
-            
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:arguments/ts:argument">
-            <tr>
-            <xsl:variable name="arg-name"><xsl:value-of select="@name"/></xsl:variable>
-            <xsl:variable name="method-name"><xsl:value-of select="../../@name"/></xsl:variable>
-            <td><a name="{$arg-name}{$method-name}"><xsl:value-of select="@name"/></a></td>
-            <td><xsl:value-of select="../../@name"/></td>
-            <td><xsl:value-of select="@type"/></td>
-            <td><xsl:value-of select="@typeMultiplicity"/></td>
-            <xsl:if test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-            </xsl:if>
-            <xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-            </xsl:if>
-            <td><xsl:value-of select="@defaultValue"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            
-            </tr>
-            </xsl:for-each>
-            </table>
-
-<font color="#000099">
- <h4>Argument Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Argument</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-            
-            </xsl:if>
-            
-            <xsl:if test="count(ts:methods/ts:method) = 0">
-            <p>No methods</p>
-            </xsl:if>
-            
-     </xsl:if>
-     </xsl:for-each>
-
-  </body>
-  </html>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/generators/export-xml/resources/converter.xsl b/generators/export-xml/resources/converter.xsl
deleted file mode 100644
index d1aa77b..0000000
--- a/generators/export-xml/resources/converter.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0">
-
-<xsl:template match="/">
- <html>
-    
-
-    <body>
-    <h2>Artifacts within Project: <xsl:value-of select="ts:tigerstripeProject/@name"/>
-        Version: <xsl:value-of select="ts:tigerstripeProject/@version"/></h2>
-    <hr/>
-    <p/>
-    
-
-    <table border="1">
-    <tr bgcolor="#9acd32">
-      <th align="left">Artifact Name</th>
-      <th align="left">Type</th>
-    </tr>
-    <xsl:for-each select="ts:tigerstripeProject/ts:artifactFile">
-    <xsl:sort select="@name"/>
-    <xsl:variable name="file-name"><xsl:value-of select="@fileName"/></xsl:variable>
-    <tr>    
-      <td><a href="{$file-name}" target="_blank"><xsl:value-of select="@name"/></a></td>   
-      <td><xsl:value-of select="@artifactType"/></td>
-    </tr>
-    </xsl:for-each>
-    </table>
-    <br/>
-    
-  </body>
-
-  </html>
-  
- 
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/generators/export-xml/resources/tigerstripeExportSchema.xsd b/generators/export-xml/resources/tigerstripeExportSchema.xsd
deleted file mode 100644
index 723a510..0000000
--- a/generators/export-xml/resources/tigerstripeExportSchema.xsd
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Steve Jerman (Cisco Systems) -->
-<xs:schema xmlns:tns="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0" elementFormDefault="qualified" version="1.1">
-	<xs:element name="tigerstripeProject">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:choice>
-					<xs:element ref="tns:artifact" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:artifactFile" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:choice>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="version" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifact">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:implements" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:literals" minOccurs="0"/>
-				<xs:element ref="tns:fields" minOccurs="0"/>
-				<xs:element ref="tns:methods" minOccurs="0"/>
-				<xs:choice>
-					<xs:element ref="tns:enumerationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationClassSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:dependencySpecifics" minOccurs="0"/>
-					<xs:element ref="tns:querySpecifics" minOccurs="0"/>
-				</xs:choice>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="extendedArtifact" type="xs:string" use="optional"/>
-			<xs:attribute name="artifactType" type="xs:string" use="optional"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="optional"/>
-			<!-- The name and extendedArtifact are the FQNs of the artifacts not the simple name -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifactFile">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="artifactType" type="xs:string" use="optional"/>
-			<xs:attribute name="fileName" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="fields">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:field" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="field">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="readonly" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literals">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:literal" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literal">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="value" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="methods">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:method" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="method">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:arguments" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element ref="tns:returnStereotypes" minOccurs="0"/>
-				<xs:element ref="tns:exceptions" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="returnType" type="xs:string" use="optional"/>
-			<xs:attribute name="returnTypeMultiplicity" type="xs:string" use="optional"/>
-			<xs:attribute name="isVoid" type="xs:boolean" use="required"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultReturnValue" type="xs:string" use="optional"/>
-			<xs:attribute name="methodReturnName" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="arguments">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:argument" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="argument">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="optional"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exceptions">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:exception" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exception">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<!-- The value in name is the FQN -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="returnStereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotype">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypeAttribute" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypeAttribute">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="array" type="xs:boolean" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="implements">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="implementedInterface" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Specific content for each Artifact Type -->
-	<xs:element name="enumerationSpecifics">
-		<xs:complexType>
-			<xs:attribute name="baseType" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Note, the two associationEnds are AEnd and ZEnd -->
-	<xs:element name="associationEnd">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="end" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="multiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="aggregation" type="xs:string" use="required"/>
-			<xs:attribute name="changeable" type="xs:string" use="required"/>
-			<xs:attribute name="navigable" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<!-- the value for "end" cannot be extracted from the model and so is set in the template -->
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationClassSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="dependencySpecifics">
-		<xs:complexType>
-			<xs:attribute name="aEndTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="zEndTypeName" type="xs:string" use="required"/>
-			<!-- The value in EndTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="querySpecifics">
-		<xs:complexType>
-			<xs:attribute name="returnedTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="returnedTypeMultiplicity" type="xs:string" use="required"/>
-			<!-- The value in returnedTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/EntityUtil.java b/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/EntityUtil.java
deleted file mode 100644
index e9881b3..0000000
--- a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/EntityUtil.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.plugins.xml;
-
-import java.lang.String;
-
-public class EntityUtil {
-
-	public String getFlag(String in){
-		if (in.contains(":")){
-			return in.substring(0,in.indexOf(":"));
-		}
-		if (in.contains(";")){
-			return in.substring(0,in.indexOf(";"));
-		}
-		else return in;
-	}
-	
-	/**
-	 * 	Returns the path which is the package name transformed into a path description.
-	 * 
-	 * @return String - the path to be used
-	 */
-	public String convertToPath(String inString){
-		return inString.replace(".", "/");
-	}
-	
-	public String pathToRoot(String inString){
-		String[] bits = inString.split("\\.");
-		String outString = "";
-		for(int i=0; i<bits.length; i++){
-			outString = outString + "../";
-		}
-		return outString;
-	}
-	
-/*	public String[] getExceptions(String in){
-		return in;
-	}
-	*/
-	public String encode(String str) {
-		  if (str == null)
-		   return "";
-
-		  StringBuffer sb = new StringBuffer();
-		  char[] data = str.toCharArray();
-		  char c, lastC = 0x0;
-		  for (char element : data) {
-		   c = element;
-		   if (c == '"') {
-		    sb.append("&quot;");
-		   } else if (c == '\'') {
-		    sb.append("&apos;");
-		   } else if (c == '<') {
-		    	sb.append("&lt;");
-		   } else if (c == '>') {
-			   sb.append("&gt;");
-		   }
-		   else if (c == '&') {
-		    sb.append("&amp;");
-		   } else if (c == '/' && lastC == '*') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&eCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else if (c == '*' && lastC == '/') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&bCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else {
-		    sb.append(c);
-		   }
-		   lastC = c;
-		  }
-		  return sb.toString();
-		 }
-}
diff --git a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/XmlModel.java b/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/XmlModel.java
deleted file mode 100644
index d1f83fa..0000000
--- a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/XmlModel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.plugins.xml;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactModel;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-public class XmlModel implements IArtifactModel{
-
-	private IAbstractArtifact artifact;
-	private IPluginConfig pluginRef;
-	
-	public void setIArtifact(IAbstractArtifact artifact ){
-		this.artifact = artifact;
-	}
-	
-	public void setPluginConfig(IPluginConfig newPluginRef) {
-		this.pluginRef = newPluginRef;
-}
-	
-	/**
-	 * 	Returns the path which is the package name transformed into a path description.
-	 * 
-	 * @return String - the path to be used
-	 */
-	public String getOutPath(){
-		return this.artifact.getPackage().replace(".", "/");
-	}
-	
-}
diff --git a/generators/export-xml/templates/artifact_details.vm b/generators/export-xml/templates/artifact_details.vm
deleted file mode 100644
index 45c84c6..0000000
--- a/generators/export-xml/templates/artifact_details.vm
+++ /dev/null
@@ -1,35 +0,0 @@
-    <ts:artifact name="$artifact.FullyQualifiedName"
-#if ($artifact.hasExtends())
-                 extendedArtifact="$artifact.Extends.FullyQualifiedName"
-#end
-                 artifactType="$artifact.ArtifactType"
-#if ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IPackageArtifact")
-                 isAbstract="$artifact.Abstract"
-#end
-                 >
-#if(!$artifact.getImplementedArtifacts().isEmpty())
-        <ts:implements>
-#foreach ($interface in $artifact.getImplementedArtifacts())
-            <ts:implementedInterface>$interface.FullyQualifiedName</ts:implementedInterface>
-#end
-        </ts:implements>
-#end
-#set($component = $artifact)
-#parse ("templates/xml/Comment.vm")
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Labels.vm")
-#parse ("templates/xml/Fields.vm")
-#parse ("templates/xml/Methods.vm")
-#set($component = $artifact)
-#if ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact")
-#parse ("templates/xml/enumerationSpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact")
-#parse ("templates/xml/associationSpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact")
-#parse ("templates/xml/associationClassSpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact")
-#parse ("templates/xml/dependencySpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact")
-#parse ("templates/xml/querySpecifics.vm")
-#end
-    </ts:artifact>
diff --git a/generators/export-xml/templates/tigerstripeArtifactExport.vm b/generators/export-xml/templates/tigerstripeArtifactExport.vm
deleted file mode 100644
index ee83f6a..0000000
--- a/generators/export-xml/templates/tigerstripeArtifactExport.vm
+++ /dev/null
@@ -1,17 +0,0 @@
-#set ($singleFile = $pluginConfig.getProperty("singleFile"))
-#if($singleFile == "false")
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:tns="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0" version="1.0" xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0">
-    <xs:import namespace="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-            schemaLocation="tigerstripeExportSchema.xsd"/>
-        <xs:element name="projectArtifact">
-           <xs:complexType>
-               <xs:sequence>
-                   <xs:element maxOccurs="1" minOccurs="1" ref="ts:artifact"/>
-               </xs:sequence>
-               <xs:attribute name="projectName" type="xs:string" use="required"/>
-               <xs:attribute name="projectVersion" type="xs:string" use="required"/>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml/Arguments.vm b/generators/export-xml/templates/xml/Arguments.vm
deleted file mode 100644
index 770fa12..0000000
--- a/generators/export-xml/templates/xml/Arguments.vm
+++ /dev/null
@@ -1,18 +0,0 @@
-#if(!$method.Arguments.isEmpty())
-                <ts:arguments>
-#foreach ($argument in $method.Arguments)
-                    <ts:argument name="$argument.Name" typeMultiplicity="$argument.Type.TypeMultiplicity.Label"
-                     type="$argument.Type.FullyQualifiedName"
-                     unique="$argument.Unique" ordered="$argument.Ordered" 
-#if ($argument.DefaultValue)
-                     defaultValue="$entityUtil.encode($argument.DefaultValue)"
-#end
-                     >
-#set($component = $argument)
-#parse ("templates/xml/Comment.vm")
-#set($component = $argument)
-#parse ("templates/xml/Stereotypes.vm")
-		                </ts:argument>
-#end
-                </ts:arguments>
-#end
diff --git a/generators/export-xml/templates/xml/Comment.vm b/generators/export-xml/templates/xml/Comment.vm
deleted file mode 100644
index 215361b..0000000
--- a/generators/export-xml/templates/xml/Comment.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-#if($component.Comment.length() != 0)
-                <ts:comment>$entityUtil.encode($component.comment)</ts:comment>
-#end
diff --git a/generators/export-xml/templates/xml/Exceptions.vm b/generators/export-xml/templates/xml/Exceptions.vm
deleted file mode 100644
index e4aee76..0000000
--- a/generators/export-xml/templates/xml/Exceptions.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-#if(!$method.Exceptions.isEmpty())
-                <ts:exceptions>
-#foreach ($exception in $method.Exceptions)
-                    <ts:exception name="$exception.FullyQualifiedName"/>
-#end
-                </ts:exceptions>
-#end
diff --git a/generators/export-xml/templates/xml/Fields.vm b/generators/export-xml/templates/xml/Fields.vm
deleted file mode 100644
index 47ed313..0000000
--- a/generators/export-xml/templates/xml/Fields.vm
+++ /dev/null
@@ -1,18 +0,0 @@
-#if(!$artifact.Fields.isEmpty())
-        <ts:fields>
-#foreach($field in $artifact.Fields)
-            <ts:field name="$field.Name" visibility="$field.Visibility.Label" 
-            type="$field.Type.FullyQualifiedName" typeMultiplicity="$field.Type.TypeMultiplicity.Label"
-             readonly="$field.ReadOnly"
-             unique="$field.Unique" ordered="$field.Ordered"
-#if ( $field.DefaultValue)
-             defaultValue="$entityUtil.encode($field.DefaultValue)"
-#end
-             >
-#set ($component = $field)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-            </ts:field>
-#end
-        </ts:fields>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml/Labels.vm b/generators/export-xml/templates/xml/Labels.vm
deleted file mode 100644
index 1c5c9de..0000000
--- a/generators/export-xml/templates/xml/Labels.vm
+++ /dev/null
@@ -1,11 +0,0 @@
-#if(!$artifact.Literals.isEmpty())
-        <ts:literals>
-#foreach ($label in $artifact.Literals)
-                <ts:literal name="$label.Name" value="$entityUtil.encode($label.Value)" type="$label.Type.FullyQualifiedName" visibility="$label.Visibility.Label">
-#set ($component = $label)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-                </ts:literal>
-#end
-        </ts:literals>
-#end
diff --git a/generators/export-xml/templates/xml/MethodFlavorExceptions.vm b/generators/export-xml/templates/xml/MethodFlavorExceptions.vm
deleted file mode 100644
index 490be3b..0000000
--- a/generators/export-xml/templates/xml/MethodFlavorExceptions.vm
+++ /dev/null
@@ -1,5 +0,0 @@
-                <ts:exceptions>
-#foreach ($exception in $EntityMethodFlavorDetails.Exceptions)
-	                    <ts:exception name="$exception"/>
-#end
-                <ts:/exceptions>
diff --git a/generators/export-xml/templates/xml/Methods.vm b/generators/export-xml/templates/xml/Methods.vm
deleted file mode 100644
index 657581b..0000000
--- a/generators/export-xml/templates/xml/Methods.vm
+++ /dev/null
@@ -1,28 +0,0 @@
-#if(!$artifact.Methods.isEmpty())
-        <ts:methods>
-#foreach($method in $artifact.Methods)
-            <ts:method name="$method.Name" visibility="$method.Visibility.Label" returnType="$method.ReturnType.FullyQualifiedName" 
-                       returnTypeMultiplicity="$method.ReturnType.TypeMultiplicity.Label" isVoid="$method.Void" 
-                       isAbstract="$method.Abstract"
-                       unique="$method.Unique" ordered="$method.Ordered"
-#if ($method.DefaultReturnValue)
-                       defaultReturnValue="$entityUtil.encode($method.DefaultReturnValue)"
-#end
-#if($method.ReturnName.length() != 0)
-                       methodReturnName="$entityUtil.encode($method.ReturnName)"
-#end
-                       >
-#set($component = $method)
-#parse ("templates/xml/Stereotypes.vm")
-#set($component = $method)
-#parse ("templates/xml/Arguments.vm")
-#set($component = $method)
-#parse ("templates/xml/ReturnStereotypes.vm")
-#set($component = $method)
-#parse ("templates/xml/Exceptions.vm")
-#set($component = $method)
-#parse ("templates/xml/Comment.vm")
-            </ts:method>
-#end
-        </ts:methods>
-#end
diff --git a/generators/export-xml/templates/xml/ReturnStereotypes.vm b/generators/export-xml/templates/xml/ReturnStereotypes.vm
deleted file mode 100644
index f360807..0000000
--- a/generators/export-xml/templates/xml/ReturnStereotypes.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-#if(!$component.ReturnStereotypeInstances.isEmpty())
-                <ts:returnStereotypes>
-#foreach ($instance in $component.ReturnStereotypeInstances)
-#parse("templates/xml/StereoTypeCommon.vm")
-#end
-                </ts:returnStereotypes>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml/StereoTypeCommon.vm b/generators/export-xml/templates/xml/StereoTypeCommon.vm
deleted file mode 100644
index c23b816..0000000
--- a/generators/export-xml/templates/xml/StereoTypeCommon.vm
+++ /dev/null
@@ -1,13 +0,0 @@
-                   <ts:stereotype name="$instance.Name">
-#foreach ($attribute in $instance.CharacterizingStereotype.Attributes)
-                      <ts:stereotypeAttribute name="$attribute.Name" array="$attribute.Array">
-#if($attribute.Array == "false")
-                        <ts:value>$entityUtil.encode($instance.getAttributeValue($attribute))</ts:value>                       
-#else
-#foreach ($val in $instance.getAttributeValues($attribute))
-                        <ts:value>$entityUtil.encode($val)</ts:value>                   
-#end
-#end
-                      </ts:stereotypeAttribute>
-#end
-                   </ts:stereotype>
diff --git a/generators/export-xml/templates/xml/Stereotypes.vm b/generators/export-xml/templates/xml/Stereotypes.vm
deleted file mode 100644
index a5797e5..0000000
--- a/generators/export-xml/templates/xml/Stereotypes.vm
+++ /dev/null
@@ -1,8 +0,0 @@
-#if(!$component.StereotypeInstances.isEmpty())
-                <ts:stereotypes>
-#foreach ($instance in $component.StereotypeInstances)
-#parse("templates/xml/StereoTypeCommon.vm")
-#end
-
-                </ts:stereotypes>
-#end
diff --git a/generators/export-xml/templates/xml/associationClassSpecifics.vm b/generators/export-xml/templates/xml/associationClassSpecifics.vm
deleted file mode 100644
index 482b2fd..0000000
--- a/generators/export-xml/templates/xml/associationClassSpecifics.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-        <ts:associationClassSpecifics>
-#parse ("templates/xml/associationEnd.vm")
-        </ts:associationClassSpecifics>
diff --git a/generators/export-xml/templates/xml/associationEnd.vm b/generators/export-xml/templates/xml/associationEnd.vm
deleted file mode 100644
index 737c95d..0000000
--- a/generators/export-xml/templates/xml/associationEnd.vm
+++ /dev/null
@@ -1,16 +0,0 @@
-            <ts:associationEnd name="$artifact.AEnd.Name" end="AEnd" type="$artifact.AEnd.Type.FullyQualifiedName" multiplicity="$artifact.AEnd.Multiplicity.Label" 
-                                       aggregation="$artifact.AEnd.Aggregation.Label" changeable="$artifact.AEnd.Changeable.Label" navigable="$artifact.AEnd.Navigable" 
-                                       ordered="$artifact.AEnd.Ordered" visibility="$artifact.AEnd.Visibility"
-                                       unique="$artifact.AEnd.Unique">
-#set ($component = $artifact.AEnd)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-            </ts:associationEnd>
-            <ts:associationEnd name="$artifact.ZEnd.Name" end="ZEnd" type="$artifact.ZEnd.Type.FullyQualifiedName" multiplicity="$artifact.ZEnd.Multiplicity.Label" 
-                                       aggregation="$artifact.ZEnd.Aggregation.Label" changeable="$artifact.ZEnd.Changeable.Label" navigable="$artifact.ZEnd.Navigable" 
-                                       ordered="$artifact.ZEnd.Ordered" visibility="$artifact.ZEnd.Visibility"
-                                       unique="$artifact.ZEnd.Unique">
-#set ($component = $artifact.ZEnd)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-            </ts:associationEnd>
diff --git a/generators/export-xml/templates/xml/associationSpecifics.vm b/generators/export-xml/templates/xml/associationSpecifics.vm
deleted file mode 100644
index dbb114e..0000000
--- a/generators/export-xml/templates/xml/associationSpecifics.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-        <ts:associationSpecifics>
-#parse ("templates/xml/associationEnd.vm")
-        </ts:associationSpecifics>
diff --git a/generators/export-xml/templates/xml/dependencySpecifics.vm b/generators/export-xml/templates/xml/dependencySpecifics.vm
deleted file mode 100644
index d370879..0000000
--- a/generators/export-xml/templates/xml/dependencySpecifics.vm
+++ /dev/null
@@ -1,2 +0,0 @@
-        <ts:dependencySpecifics aEndTypeName="$artifact.AEndType.FullyQualifiedName" 
-                                zEndTypeName="$artifact.ZEndType.FullyQualifiedName"/>
diff --git a/generators/export-xml/templates/xml/enumerationSpecifics.vm b/generators/export-xml/templates/xml/enumerationSpecifics.vm
deleted file mode 100644
index d68b383..0000000
--- a/generators/export-xml/templates/xml/enumerationSpecifics.vm
+++ /dev/null
@@ -1 +0,0 @@
-        <ts:enumerationSpecifics baseType="$artifact.BaseTypeStr"/>
diff --git a/generators/export-xml/templates/xml/querySpecifics.vm b/generators/export-xml/templates/xml/querySpecifics.vm
deleted file mode 100644
index aa0da7a..0000000
--- a/generators/export-xml/templates/xml/querySpecifics.vm
+++ /dev/null
@@ -1 +0,0 @@
-        <ts:querySpecifics returnedTypeName="$artifact.ReturnedType.FullyQualifiedName" returnedTypeMultiplicity="$artifact.ReturnedType.TypeMultiplicity.Label"/>
diff --git a/generators/export-xml/templates/xml_export.vm b/generators/export-xml/templates/xml_export.vm
deleted file mode 100644
index 0ce4c9c..0000000
--- a/generators/export-xml/templates/xml_export.vm
+++ /dev/null
@@ -1,45 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#set ($singleFile = $pluginConfig.getProperty("singleFile"))
-#set ($indexXSL = $pluginConfig.getProperty("IndexXSL"))
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- *
- *	Generated with Tigerstripe Workbench $runtime.getProperty("tigerstripe.feature.version").
- *
- *
- *	Plugin  : $pluginConfig.groupId/$pluginConfig.pluginId ($pluginConfig.Version)
- *	
- *  DO NOT EDIT THIS CODE WAS AUTOMATICALLY GENERATED
--->
-<!--
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
--->
-
-#if($singleFile == "false")
-<?xml-stylesheet version="1.0" type="text/xsl" href="./xsl/$indexXSL"?>
-#end
-
-<ts:tigerstripeProject name="$tsProject.ProjectDetails.Name" version="$tsProject.ProjectDetails.Version"
-                       xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                       xsi:schemaLocation="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0 tigerstripeExportSchema.xsd">
-#foreach($artifact in $artifacts)
-#if($singleFile == "true")
-#parse ("templates/artifact_details.vm")
-#else
-        <ts:artifactFile name="$artifact.FullyQualifiedName" artifactType="$artifact.ArtifactType" fileName="$entityUtil.convertToPath($artifact.Package)/${artifact.Name}.xml"/>
-#end
-#end
-</ts:tigerstripeProject>
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml_per_artifact.vm b/generators/export-xml/templates/xml_per_artifact.vm
deleted file mode 100644
index 77645f5..0000000
--- a/generators/export-xml/templates/xml_per_artifact.vm
+++ /dev/null
@@ -1,42 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#set ($singleFile = $pluginConfig.getProperty("singleFile"))
-#set ($artifactXSL = $pluginConfig.getProperty("ArtifactXSL"))
-#if($singleFile == "false")
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- *
- *	 Generated with Tigerstripe Workbench $runtime.getProperty("tigerstripe.feature.version").
- *
- *
- *	Plugin  : $pluginConfig.groupId/$pluginConfig.pluginId ($pluginConfig.Version)
- *	
- *  DO NOT EDIT THIS CODE WAS AUTOMATICALLY GENERATED
--->
-<!--
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
--->
-
-
-<?xml-stylesheet version="1.0" type="text/xsl" href="$entityUtil.pathToRoot($artifact.Package)xsl/$artifactXSL"?>
-
-
-<tsa:projectArtifact projectName="$tsProject.ProjectDetails.Name" projectVersion="$tsProject.ProjectDetails.Version"
-                       xmlns:tsa="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0"
-                       xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                       xsi:schemaLocation="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0 tigerstripeArtifactExport.xsd">
-#parse ("templates/artifact_details.vm")
-</tsa:projectArtifact>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/ts-plugin.xml b/generators/export-xml/ts-plugin.xml
deleted file mode 100644
index df461fb..0000000
--- a/generators/export-xml/ts-plugin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts_plugin version="1.2">
-<project name="export-xml">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>3.3</version>
-<description>3.3 Support for Package Artifacts - small change to schema to make isAbstract Optional&#13;
-3.2 Fix for XML escape characters bug and schema sequence order issue.&#13;
-3.1 First Open Source version - removal of OSS/J specifics.&#13;
-This version of the Export Plugin can export a Tigerstripe Project in a single XML file or as one XML file per artifact (with an additional file giving summary details of the export).&#13;
-&#13;
-The XSD schema files that define the format of the exported XML are also generated to the ouput directory.&#13;
-&#13;
-Optionally XSL files can be included in the export such that HTML documentation of the Tigerstripe Project can be generated from the XML.&#13;
-&#13;
-Version 1.2.0 supprts meta model changes from Tigerstripe 2.2</description>
-<provider>Cisco Systems</provider>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="0" isEnabled="true" logPath="Full_Export.log" maxRoll="9"/>
-<globalProperties>
-<property name="xmldir" tipToolText="Directory to which export xml files are generated" type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">xml</property>
-<property name="singleFile" tipToolText="Create single XML file (true) or one per artifact (false)" type="org.eclipse.tigerstripe.workbench.plugins.IBooleanPluginProperty">true</property>
-<property name="IndexXSL" tipToolText="XSL file used to generate index page." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">converter.xsl</property>
-<property name="ArtifactXSL" tipToolText="XSL used to generate artifact detail pages." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">artifact_converter.xsl</property>
-</globalProperties>
-<globalRules>
-<rule description="Extracts the selected Tigerstripe model to single XML file &lt;project_name&gt;.xml. The file is generated to the directory: tigerstripe.gen\&lt;xmldir&gt;." enabled="true" name="xml_export" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.plugins.xml.EntityUtil" entry="entityUtil"/>
-<body outputFile="${ppProp.xmldir}\${name}.xml" overwriteFiles="true" suppressFiles="true" template="templates\xml_export.vm"/>
-</rule>
-<rule description="Generates the schema file for the &quot;file per artifact&quot; export files and places it in the directory: tigerstripe.gen\&lt;xmldir&gt;." enabled="true" name="copyPerArtiSchema" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<body outputFile="${ppProp.xmldir}\tigerstripeArtifactExport.xsd" overwriteFiles="true" suppressFiles="true" template="templates\tigerstripeArtifactExport.vm"/>
-</rule>
-<rule description="Copy xml export schema from generator project to model project." enabled="true" name="schema" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\tigerstripeExportSchema.xsd" toDirectory="${ppProp.xmldir}\"/>
-</rule>
-<rule description="Copies the XSL files to tigerstripe.gen/&lt;xmldir&gt;/xslt directory." enabled="true" name="copyXSLs" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\*.xsl" toDirectory="${ppProp.xmldir}\xsl"/>
-</rule>
-</globalRules>
-<artifactRules>
-<rule description="Extracts the selected Tigerstripe model such that one XML export file is generated for each artifact. The XML export files have the following name &lt;artifact_name&gt;.xml. The files are generated to the directory: tigerstripe.gen\&lt;xmldir&gt;." enabled="true" name="xml_per_artifact" type="org.eclipse.tigerstripe.workbench.plugins.IArtifactBasedTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.plugins.xml.EntityUtil" entry="entityUtil"/>
-<body artifactFilterClass="" artifactType="Any Artifact" includeDependencies="false" modelClass="org.eclipse.tigerstripe.plugins.xml.XmlModel" modelClassName="model" outputFile="${ppProp.xmldir}/${model.OutPath}/${artifact.Name}.xml" overwriteFiles="true" suppressFiles="true" template="templates\xml_per_artifact.vm"/>
-</rule>
-</artifactRules>
-<classpathEntries/>
-<additionalFiles>
-<includeEntry relativePath="resources/"/>
-</additionalFiles>
-<advanced/>
-</ts_plugin>
diff --git a/generators/m0xml/.classpath b/generators/m0xml/.classpath
deleted file mode 100644
index 4ab2dac..0000000
--- a/generators/m0xml/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="lib" path="commons-lang-2.1.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/m0xml/.cvsignore b/generators/m0xml/.cvsignore
deleted file mode 100644
index 5a63071..0000000
--- a/generators/m0xml/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-classes
-.annotations
diff --git a/generators/m0xml/.project b/generators/m0xml/.project
deleted file mode 100644
index 477d0db..0000000
--- a/generators/m0xml/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.generators.m0xml</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.ui.base.m0GeneratorProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/m0xml/about.html b/generators/m0xml/about.html
deleted file mode 100644
index b8d3c56..0000000
--- a/generators/m0xml/about.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>April 14, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this
-plug-in (&quot;Content&quot;). Unless otherwise indicated below, the
-Content is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is
-available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse
-Foundation, the Content is being redistributed by another party
-(&quot;Redistributor&quot;) and different terms and conditions may apply
-to your use of any object code in the Content. Check the Redistributor's
-license that was provided with the Content. If no such license exists,
-contact the Redistributor. Unless otherwise indicated below, the terms
-and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a
-	href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this Content directly
-from the Eclipse Foundation, the following is provided for informational
-purposes only, and you should look to the RedistributorÕs license for
-terms and conditions of use.</p>
-
-<h4>Apache Commons Components</h4>
-<p>The Commons is an Apache project focused on all aspects of
-reusable Java components (see <a href="http://commons.apache.org/">http://commons.apache.org/</a>).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<p>
-<p>This Tigerstripe Generator plugin includes binary versions of 1 sub-project of Apache
-Commons:
-<ul>
-	<li><strong>commons-lang-2.1.jar</strong>: Provides extra
-	functionality for classes in java.lang.</li>
-</ul>
-All Apache Commons components as subject to the terms and conditions of
-the
-<a href="http://commons.apache.org/license.html">Apache 2.0 License</a>
-.
-</p>
-</body>
-</html>
diff --git a/generators/m0xml/commons-lang-2.1.jar b/generators/m0xml/commons-lang-2.1.jar
deleted file mode 100644
index 87b80ab..0000000
--- a/generators/m0xml/commons-lang-2.1.jar
+++ /dev/null
Binary files differ
diff --git a/generators/m0xml/m0-generator.xml b/generators/m0xml/m0-generator.xml
deleted file mode 100644
index e73c509..0000000
--- a/generators/m0xml/m0-generator.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<m0-generator>
-<project name="MO Instance XML Plugin">
-<outputDirectory/>
-<version>0.3M1</version>
-<description>Convert M0 instance diagram to XML representation</description>
-<provider>Cisco</provider>
-</project>
-<pluginNature type="M0"/>
-<logger defautLevel="0" isEnabled="false" logPath="TestOut.log" maxRoll="9"/>
-<globalProperties/>
-<globalRules>
-<rule description="" enabled="true" name="XMLFile" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.plugins.m0xml.XmlUtils" entry="xmlUtils"/>
-<body outputFile="instances.xml" overwriteFiles="true" suppressFiles="true" template="templates\xml.vm"/>
-</rule>
-</globalRules>
-<classpathEntries>
-<entry relativePath="commons-lang-2.2.jar"/>
-</classpathEntries>
-<additionalFiles/>
-<advanced/>
-</m0-generator>
diff --git a/generators/m0xml/src/org/eclipse/tigerstripe/plugins/m0xml/XmlUtils.java b/generators/m0xml/src/org/eclipse/tigerstripe/plugins/m0xml/XmlUtils.java
deleted file mode 100644
index 85a0b2f..0000000
--- a/generators/m0xml/src/org/eclipse/tigerstripe/plugins/m0xml/XmlUtils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    S. Jerman (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
- *******************************************************************************/
-package org.eclipse.tigerstripe.plugins.m0xml;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-
-public class XmlUtils {
-	
-	public static String getArtifactType(IAbstractArtifact artifact){
-		return "Unkown";
-	}
-
-	public static String getArtifactType(IDatatypeArtifact artifact){
-		return "ComplexType";
-	}
-	public static String getArtifactType(IEnumArtifact artifact){
-		return "Enumeration";
-	}
-
-	public static String getArtifactType(IAssociationClassArtifact artifact){
-		return "AssociationClass";
-	}
-
-	public static String getArtifactType(IManagedEntityArtifact artifact){
-		return "Class";
-	}
-	
-	private static Pattern quotePattern = Pattern.compile("^\".*\"$");
-	
-	/**
-	 * Split up string. delimiter is ',' - strings will be quoted.
-	 * Need to XML encode strings.
-	 * @param type
-	 * @param value
-	 * @return
-	 */
-	
-	
-	public static Collection<String> splitValues(String type, String value){
-		Collection<String> ret = new ArrayList<String>();
-		String[] sStr = value.split(",");
-		for (String s : sStr){
-			ret.add(StringEscapeUtils.escapeXml(s.trim()));
-//			ret.add(s);
-		}
-		return ret;
-	}
-
-}
\ No newline at end of file
diff --git a/generators/m0xml/templates/xml.vm b/generators/m0xml/templates/xml.vm
deleted file mode 100644
index fb2d69b..0000000
--- a/generators/m0xml/templates/xml.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InstanceMap xmlns="http://tigerstripe.eclipse.org/instances" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tigerstripe.eclipse.org/instances
-..\..\main\xsd\instances.xsd">
-
-#foreach( $cInstance in $classInstances )
-#set($type=$xmlUtils.getArtifactType($cInstance.Artifact))
-  <$type artifactName="$cInstance.InstanceName" class="$cInstance.Artifact.FullyQualifiedName" name="$cInstance.Artifact.name">
-#foreach( $variable in $cInstance.Variables )
-    <Variable name="$variable.Name" type="$variable.type" >
-#set($values = $xmlUtils.splitValues($variable.type,$variable.value))
-#foreach($value in $values) 
-        <Value>$value</Value>
-#end
-    </Variable>
-#end
-  </$type> 
-
-#end 
-#foreach( $association in $associationInstances )
-    <Association name="$association.Name" class="$association.Artifact.FullyQualifiedName">
-      <aEnd navigable="$association.aEndIsNavigable" name="$association.AEndName" artifactName="$association.AEnd.artifactName" />
-      <zEnd navigable="$association.zEndIsNavigable" name="$association.ZEndName" artifactName="$association.ZEnd.artifactName" />
-    </Association>
-
-#end
-</InstanceMap>
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/.classpath b/generators/tigerstripe-documentation/.classpath
deleted file mode 100644
index c55ffef..0000000
--- a/generators/tigerstripe-documentation/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="lib" path="commons-lang-2.1.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/tigerstripe-documentation/.project b/generators/tigerstripe-documentation/.project
deleted file mode 100644
index f68d048..0000000
--- a/generators/tigerstripe-documentation/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tigerstripe-documentation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.pluggablePluginProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripePluginProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/tigerstripe-documentation/.settings/org.eclipse.jdt.core.prefs b/generators/tigerstripe-documentation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d03fa9d..0000000
--- a/generators/tigerstripe-documentation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed May 28 09:59:04 BST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/generators/tigerstripe-documentation/about.html b/generators/tigerstripe-documentation/about.html
deleted file mode 100644
index f1f3ef6..0000000
--- a/generators/tigerstripe-documentation/about.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 9, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this
-plug-in (&quot;Content&quot;). Unless otherwise indicated below, the
-Content is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is
-available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse
-Foundation, the Content is being redistributed by another party
-(&quot;Redistributor&quot;) and different terms and conditions may apply
-to your use of any object code in the Content. Check the Redistributor's
-license that was provided with the Content. If no such license exists,
-contact the Redistributor. Unless otherwise indicated below, the terms
-and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a
-	href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this Content directly
-from the Eclipse Foundation, the following is provided for informational
-purposes only, and you should look to the RedistributorÕs license for
-terms and conditions of use.</p>
-
-<h4>Apache Commons Components</h4>
-<p>The Commons is an Apache project focused on all aspects of
-reusable Java components (see <a href="http://commons.apache.org/">http://commons.apache.org/</a>).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<p>
-<p>This Tigerstripe Generator plugin includes binary versions of 1 sub-project of Apache
-Commons:
-<ul>
-	<li><strong>commons-lang-2.1.jar</strong>: Provides extra
-	functionality for classes in java.lang.</li>
-</ul>
-All Apache Commons components as subject to the terms and conditions of
-the
-<a href="http://commons.apache.org/license.html">Apache 2.0 License</a>
-.
-</p>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/commons-lang-2.1.zip b/generators/tigerstripe-documentation/commons-lang-2.1.zip
deleted file mode 100644
index 87b80ab..0000000
--- a/generators/tigerstripe-documentation/commons-lang-2.1.zip
+++ /dev/null
Binary files differ
diff --git a/generators/tigerstripe-documentation/resources/styles.css b/generators/tigerstripe-documentation/resources/styles.css
deleted file mode 100644
index e8e68c9..0000000
--- a/generators/tigerstripe-documentation/resources/styles.css
+++ /dev/null
@@ -1,14 +0,0 @@
-h1           { font-family: Arial; color: White; background-color: Silver; }
-.small       {font-size: 8pt }
-.ct   { font-family: Arial; color: Blue; background-color: LightSteelblue; font-style: bold;}
-.enum   { font-family: Arial; color: Blue; background-color: LightSteelblue; font-style: bold;}
-h2           { font-family: Arial; font-style: italic; }
-h3           { font-family: Arial;color: Black; font-style: bold; }
-h4           { font-family: Arial;color: Black; font-style: bold; }
-body         { background-color: White; margin-top:0 }
-.local       { background-color: Lavender }
-.nlocal     { background-color: White }
-.propHigh {color: red;}
-.assoc       { font-family: Arial; color: Blue; background-color: LightGreen; font-style: bold; }
-.intf        { font-family: Arial; color: Blue; background-color: LightSalmon; font-style: bold;}
-.classNorm   { font-family: Arial; color: Blue; background-color: LightSteelblue; font-style: bold;}
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractClassModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractClassModel.java
deleted file mode 100644
index 9276680..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractClassModel.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.generators.models;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IField;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ILiteral;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactModel;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-import org.eclipse.tigerstripe.workbench.project.IProjectDescriptor;
-import org.eclipse.tigerstripe.workbench.project.IProjectDetails;
-import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
-import org.eclipse.tigerstripe.workbench.queries.IQueryRelationshipsByArtifact;
-import org.apache.commons.lang.StringUtils;
-
-public class AbstractClassModel extends AbstractComponentModel implements IArtifactModel{
-	
-	private IAbstractArtifact artifact;
-	private Collection associationEnds;
-	private Collection dependencies;
-	
-
-	
-	
-	public AbstractClassModel(){
-		super();
-	}
-	
-	
-	public AbstractClassModel(IAbstractArtifact artifact){
-		build(artifact);
-	}
-	
-	public void setIArtifact(IAbstractArtifact artifact ){
-			build(artifact);
-	}
-
-	public void setPluginConfig(IPluginConfig newPluginRef) {
-			super.setPluginRef(newPluginRef);
-			
-	}
-
-	public void setPluginRef(IPluginConfig newPluginRef) {
-			super.setPluginRef(newPluginRef);
-			
-	}
-
-	protected void build(IAbstractArtifact artifact ){
-		super.build(artifact);
-		this.artifact = (IAbstractArtifact) artifact;
-		setRelationEnds();
-		
-	}
-	
-	/**
-	 * 	Returns the IArtifact used to build this Model
-	 * 
-	 * @return IArtifact - the artifact used to build this model
-	 */
-	public IAbstractArtifact getArtifact(){
-		return (IAbstractArtifact) this.artifact;
-	}
-	
-	public String getArtifactType(){
-		String in = this.artifact.getArtifactType();
-		return StringUtils.substringAfterLast(in, ".");	
-	}
-	
-	public String getPackage(){
-		return getArtifact().getPackage();
-	}
-	
-	
-	public String getArtifactName(){
-		return getArtifact().getName();
-	}
-	
-	/**
-	 * 	Returns the path which is the package name transformed into a path description.
-	 * 
-	 * @return String - the path to be used
-	 */
-	public String getOutPath(){
-		return getPackage().replace(".", "/");
-	}
-
-	
-	/** 
-	 * add getAssociationEnds
-	 * these are the ends of any association that "points" 
-	 * at this artifact 
-	 * 
-	 * 
-	 * 
-	 */
-	public void setRelationEnds(){
-		try {    		
-			ArrayList assEnds = new ArrayList();
-			ArrayList deps = new ArrayList();
-			ITigerstripeModelProject project = artifact.getTigerstripeProject();
-			// Legacy stuff ha sno project
-			if (project != null){
-				IArtifactManagerSession session = project.getArtifactManagerSession();    		
-				IQueryRelationshipsByArtifact outQuery = (IQueryRelationshipsByArtifact) session.makeQuery(IQueryRelationshipsByArtifact.class.getName());
-				outQuery.setIncludeDependencies(true);
-				outQuery.setOriginatingFrom(artifact.getFullyQualifiedName());
-				// OUTS
-				Collection outRefs = session.queryArtifact(outQuery);
-
-				// Each return is actually an Association Artifact, so get the "end" that points to us.
-				// We're looking at out goings, so the Aend should be us!
-				//System.out.println("Outgoing refs for "+artifact.getName() +" "+outRefs.size());
-				for (Object ref : outRefs){
-					if (ref instanceof IAssociationArtifact){
-							AssociationEndFacade aef = new AssociationEndFacade(((IAssociationArtifact)ref).getAEnd());
-							aef.setParentModel(ModelFactory.getInstance().getModel((IAssociationArtifact) ref));
-							assEnds.add(aef );
-						
-					} else if (ref instanceof IDependencyArtifact){						
-							deps.add((IDependencyArtifact)ref);
-					}
-				}
-
-				IQueryRelationshipsByArtifact inQuery = (IQueryRelationshipsByArtifact) session.makeQuery(IQueryRelationshipsByArtifact.class.getName());
-				inQuery.setTerminatingIn(artifact.getFullyQualifiedName());
-				inQuery.setIncludeDependencies(true);
-				Collection inRefs = session.queryArtifact(inQuery);
-
-				// Each return is actually an Association Artifact, so get the "end" that points to us.
-				for (Object ref : inRefs){
-					if (ref instanceof IAssociationArtifact){
-							AssociationEndFacade aef = new AssociationEndFacade(((IAssociationArtifact)ref).getZEnd());
-							aef.setParentModel(ModelFactory.getInstance().getModel((IAssociationArtifact) ref));
-							assEnds.add(aef );
-					} 
-				}
-			}
-    		associationEnds = assEnds;
-    		dependencies = deps;
-   			return ;
-    		
-		} catch (TigerstripeException t){
-			t.printStackTrace();
-			return;
-		}
-	}
-	
-	
-	
-	/**
-	 * Returns the fully qualified name for this interface model
-	 * 
-	 * @return String - the fully qualified name for this interface model
-	 */
-	public String getFullyQualifiedName(){
-		return this.artifact.getFullyQualifiedName();
-	}
-	
-	/**
-	 * Returns the generalization of this artifact.
-	 * @return
-	 */
-	public AbstractClassModel getGeneralization(){
-		
-		if (this.artifact.getExtendedArtifact() != null){
-			AbstractClassModel acm = ModelFactory.getInstance().getModel(this.artifact.getExtendedArtifact());
-			acm.setPluginRef(this.getPluginRef());
-			return acm;
-		} else {
-			return null; 
-		}		
-	}
-	
-	public Collection<AbstractClassModel> getAllGeneralizations(){
-		Collection<IAbstractArtifact> ancestors = getArtifact().getAncestors();
-		Collection<AbstractClassModel> gens = new ArrayList<AbstractClassModel>();
-		for (IAbstractArtifact ancestor : ancestors){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(ancestor);
-			model.setPluginRef(this.getPluginRef());
-			gens.add(model);
-		}
-		return gens;	
-	}
-	
-	/**
-	 *  
-	 *  Get a collection of every class that
-	 *  Extends this artifact (ie the opposite of Generalizations!) 
-	 *  
-	 */
-	public Collection getRealizations(){
-		Collection<IAbstractArtifact> realizations =  getArtifact().getExtendingArtifacts();
-		
-		Collection<IAbstractArtifact> implemented = getArtifact().getImplementingArtifacts();
-		Collection<AbstractClassModel> reals = new ArrayList<AbstractClassModel>();
-		
-		for (IAbstractArtifact realization : realizations){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(realization);
-			model.setPluginRef(this.getPluginRef());
-			reals.add(model);
-		}
-		
-		//AbstractClassModel[] reals = new AbstractClassModel[implemented.length];
-		
-		for (IAbstractArtifact implement : implemented){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(implement);
-			model.setPluginRef(this.getPluginRef());
-			//int n = realizations.length + i;
-			reals.add(model);
-		}
-		return reals;	
-	
-	}
-
-	/**
-	 *  
-	 *  Get a collection of every class that this artifact
-	 *  "exposes"
-	 */
-	public Collection getImplements(){	
-		Collection<IAbstractArtifact> implemented = getArtifact().getImplementedArtifacts();
-		Collection<AbstractClassModel> impls = new ArrayList<AbstractClassModel>();
-		
-		for (IAbstractArtifact implement : implemented){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(implement);
-			model.setPluginRef(this.getPluginRef());
-			//int n = realizations.length + i;
-			impls.add(model);
-		}
-		return impls;	
-	
-	}
-
-	
-	/** 
-	 * rename & recast for getIextFields 
-	 * 
-	 */
-	public Collection getAttributes(){
-		Collection<FieldFacade> facades = new ArrayList<FieldFacade>();
-		for (IField field : getArtifact().getFields(true)){
-
-			FieldFacade facade = new FieldFacade( field);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	public Collection getAttributes(boolean boo){
-		Collection attributes = new ArrayList();
-		attributes.addAll(getAttributes());
-        if (boo)
-        	attributes.addAll(getInheritedAttributes());
-        return attributes;
-        
-	}
-
-	/** 
-	 * rename & recast for getInheritedIextFields 
-	 * 
-	 */
-	public Collection getInheritedAttributes(){
-		Collection<FieldFacade> facades = new ArrayList<FieldFacade>();
-		for (IField field : getArtifact().getInheritedFields(true)){
-
-			FieldFacade facade = new FieldFacade( field);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	public Collection getLiterals(boolean boo){
-		Collection attributes = new ArrayList();
-		attributes.addAll(getLiterals());
-        if (boo)
-        	attributes.addAll(getInheritedLiterals());
-        return attributes; 
-	}
-	
-	public Collection getLiterals(){
-		Collection<LabelFacade> facades = new ArrayList<LabelFacade>();
-		for (ILiteral literal : getArtifact().getLiterals(true)){
-
-			LabelFacade facade = new LabelFacade(literal);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	public Collection getInheritedLiterals(){
-		Collection<LabelFacade> facades = new ArrayList<LabelFacade>();
-		for (ILiteral literal : getArtifact().getInheritedLiterals(true)){
-
-			LabelFacade facade = new LabelFacade(literal);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-
-
-	/** 
-	 * rename & recast for getIextMethods 
-	 * 
-	 */
-	public Collection getOperations(){
-		Collection<MethodFacade> facades = new ArrayList<MethodFacade>();
-		for (IMethod method : getArtifact().getMethods(true)){
-
-			MethodFacade facade = new MethodFacade( method);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	/** 
-	 * rename & recast for getInheritedIextMethods 
-	 * 
-	 */
-	public Collection getInheritedOperations(){
-		Collection<MethodFacade> facades = new ArrayList<MethodFacade>();
-		for (IMethod method : getArtifact().getInheritedMethods(true)){
-
-			MethodFacade facade = new MethodFacade( method);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-		
-	public Collection getOperations(boolean boo){
-		Collection operations = new ArrayList();
-		operations.addAll(getOperations());
-		if (boo)
-			operations.addAll(getInheritedOperations());
-		return operations;
-	}
-	
-	/** 
-	 * add getAssociationEnds
-	 * these are the ends of any association that "points" 
-	 * at this artifact 
-	 * 
-	 */
-	public Collection getAssociationEnds(){
-		return this.associationEnds;
-	
-	}
-	
-	public Collection getNavigableConnectingEnds(){
-		ArrayList navigableEnds = new ArrayList();
-		for (Object e : getAssociationEnds()){
-			AssociationEndFacade end = (AssociationEndFacade) e;
-			if (end.getOtherEnd().isNavigable()){
-				navigableEnds.add(end.getOtherEnd());
-			}
-		}
-		return navigableEnds;
-	}
-	
-	
-	public Collection getDependencies(){
-		return this.dependencies;
-	}
-   
-	
-	public boolean isAbstract(){
-		return this.getArtifact().isAbstract();
-	}
-		
-		
-
-	/**
-	 * @return the pluginRef
-	 */
-	public IPluginConfig getPluginRef() {
-		return pluginRef;
-	}
-	
-    
-    public boolean isDataType(){
-    	if (this instanceof DatatypeModel){
-    		return true;
-    	}
-    	if (this.artifact != null ){
-    		if (this.artifact.getPackage().equals("primitive") ){
-    			return true;
-    		} else {
-    			return false;
-    		}
-    	}
-    	return true;
-    	
-    }
-    
-    public boolean isException(){
-    	if (this instanceof ExceptionModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isManagedEntity(){
-    	if (this instanceof ManagedEntityModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isDependency(){
-    	if (this instanceof DependencyModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isEnumeration(){
-    	if (this instanceof EnumerationModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isQuery(){
-    	if (this instanceof QueryModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isUpdate(){
-    	if (this instanceof UpdateProcedureModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isNotification(){
-    	if (this instanceof NotificationModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isAssociation(){
-		if (this instanceof AssociationClassModel || this instanceof AssociationModel)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean isAssociationClass(){
-		if (this instanceof AssociationClassModel)
-			return true;
-		else
-			return false;
-	}
-    
-	public boolean isInterface(){
-		if (this instanceof SessionModel)
-			return true;
-		else
-			return false;
-	}
-	
-    
-    public boolean hasExtends(){
-    	return this.artifact.hasExtends();
-    }
-    
-    public ITigerstripeModelProject  getProject(){
-    	ITigerstripeModelProject pd =null;
-    	try{
-    	pd= this.artifact.getProject();
-    	}
-    	catch (TigerstripeException t){   
-    		PluginLog.logError("Failure to find project.");
-    	}
-    	return pd;
-    }
-    
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractComponentModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractComponentModel.java
deleted file mode 100644
index e8ee324..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractComponentModel.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent;
-import org.eclipse.tigerstripe.workbench.profile.stereotype.IStereotypeInstance;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-
-public abstract class AbstractComponentModel {
-	
-	protected static IPluginConfig pluginRef;
-	
-	private IModelComponent component;
-	
-	public AbstractComponentModel() {
-		super();
-	}
-
-	public void build(IModelComponent component){
-		this.component = component;
-	}
-	
-	public String getName(){
-		return component.getName();
-	}
-	
-	public String getComment(){
-		return component.getComment();
-	}
-	
-	public Collection<IStereotypeInstance> getStereotypeInstances() {
-		return component.getStereotypeInstances();
-	}
-	
-	public String findTaggedValue(String tagToGet){
-		Collection<IStereotypeInstance> stereos = getStereotypeInstances();
-		for (IStereotypeInstance stereo :stereos){
-			if (stereo.getName().equals(tagToGet)) {
-				try {
-					String[] values = stereo.getAttributeValues("value");
-					if (values.length >0){
-					String value = values[0];
-					return value;
-					} else 
-					{
-						return "";
-					}
-				}
-				 catch (TigerstripeException t){
-					 try {
-						 String value = stereo.getAttributeValue("value");
-						 return value;
-					 } catch (TigerstripeException t2){
-						 // Basically this thing isn't set
-						 return "";
-					 }
-				 }
-			}
-		}
-		return null;
-	}
-	
-	/** 
-	 * Use for an array Stereotype attribute
-	 * @param tagToGet
-	 * @return
-	 */
-	public Collection findTaggedValues( String tagToGet){
-		Collection<String> values = new ArrayList<String>();
-		Collection<IStereotypeInstance> stereos = getStereotypeInstances();
-		for (IStereotypeInstance stereo :stereos){	
-			if (stereo.getName().equals(tagToGet)) {
-				try {
-			
-					String[] valueEntries = stereo.getAttributeValues("value");
-					for (int v=0;v<valueEntries.length;v++){
-					    values.add(valueEntries[v].trim());	
-					}
-					
-				}
-				 catch (TigerstripeException t){
-					 return null;
-				 }
-			}
-		}
-		return values;
-	}
-	
-	public IModelComponent.EVisibility getVisibility() {
-		return component.getVisibility();
-	}
-	
-	public boolean isInActiveFacet() throws TigerstripeException {
-		return component.isInActiveFacet();
-	}
-
-	public String getVisibilityStr(){
-		
-		if (getVisibility() == IModelComponent.EVisibility.PUBLIC){
-			return "public";
-		}else if (getVisibility() == IModelComponent.EVisibility.PROTECTED){
-			return "protected";
-		}else if (getVisibility() == IModelComponent.EVisibility.PRIVATE){
-			return "private";
-		} else {
-			return "public";
-		}
-	}
-
-	public String getDocumentation(String leader){
-		int lineLength = 64; 
-		return getDocumentation(leader, lineLength, true);
-	}
-	
-	
-	public String getDocumentation(String leader, int lineLength, boolean htmlStyle){
-		// split into lines and pre-pend the "leader" on each one.
-
-		// if htmlStyle, then each paragraph should be containied in <p> </p> tags.
-		// A paragraph is delimited by an empty line?
-		
-		
-		// Make the line max of lineLength Chars
-		
-		if (getComment().length() == 0){
-			return leader;
-		}
-		String fullComment = "";
-		String[] paras =  getComment().split("\n\n");
-		for (String para : paras){
-			String newComment = "";
-			String[] lines = para.split("\n");
-			for (String line: lines){
-
-				while (line.length() > lineLength-leader.length()){
-					String firstLineFullWords;
-					String remains;
-					
-					String firstline = line.substring(0,lineLength-leader.length());
-					if (firstline.contains(" ")){
-						firstLineFullWords = firstline.substring(0,firstline.lastIndexOf(" "));
-						remains = line.substring(firstLineFullWords.length()+1);
-					} else {
-						firstLineFullWords = firstline;
-						remains = line.substring(firstLineFullWords.length());
-					}
-					newComment = newComment+leader+firstLineFullWords+"\n";
-					line = remains;
-
-				}
-				newComment = newComment+leader+line;
-			}
-			if (htmlStyle){
-				newComment = leader + "<p>" + "\n" + newComment +"\n" + leader + "</p>";
-			}
-			if (fullComment.equals("")){
-				fullComment = newComment;
-			} else {
-				fullComment = fullComment + "\n"+newComment;
-			}
-		}
-		return fullComment;
-	}
-	
-
-	public String getConfiguredProperty(String property){
-		if (! isConfiguredProperty(property))
-			return "";
-		return (String) this.getPluginRef().getProperty(property).toString();
-	}
-
-	public boolean isConfiguredProperty(String property){
-		if (null  == this.getPluginRef().getProperty(property)){
-			return false; }
-		else {
-
-			return true;}
-	}
-	
-
-	public void setPluginRef(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-	}
-
-	public IPluginConfig getPluginRef() {
-		return this.pluginRef;
-	}
-	
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ArgumentFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ArgumentFacade.java
deleted file mode 100644
index 7b23e8e..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ArgumentFacade.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IArgument;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-import org.eclipse.tigerstripe.workbench.profile.stereotype.IStereotypeInstance;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-
-
-public class ArgumentFacade {
-
-	private IArgument argument;
-	private IPluginConfig pluginRef;
-	private AbstractClassModel parentModel;
-
-
-	public ArgumentFacade(){
-
-	}
-
-	public ArgumentFacade(IArgument argument) {
-		this.argument = argument;
-	}
-
-	public IType getType() {
-		return argument.getType();
-	}
-	
-
-	public String getName() {
-		return argument.getName();
-	}
-
-
-	public String getComment() {
-		return argument.getComment();
-	}
-
-
-	public IMethod getContainingMethod() {
-		return argument.getContainingMethod();
-	}
-	
-	public IArgument getArgument(){
-		return this.argument;
-	}
-
-
-	public IAbstractArtifact getContainingArtifact() {
-		return argument.getContainingArtifact();
-	}
-
-
-	public String getDefaultValue() {
-		return argument.getDefaultValue();
-	}
-
-
-	public boolean isOrdered() {
-		return argument.isOrdered();
-	}
-
-
-	public boolean isUnique() {
-		return argument.isUnique();
-	}
-
-	public boolean hasExactStereotype( String stereotypeName){
-		Collection<IStereotypeInstance> stereos = getStereotypeInstances();
-		for (IStereotypeInstance stereo : stereos ){
-			if (stereo.getName().equals(stereotypeName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public Collection<IStereotypeInstance> getStereotypeInstances() {
-		return this.argument.getStereotypeInstances();
-	}
-
-	public void setPluginRef(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-	}
-	
-	/**
-	* "Getter" for lowerMultiplicity.
-	* No comment found in UML.
-	*/
-    public java.lang.String getLowerMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-
-    public java.lang.String getMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0..1";
-    	case ZERO_STAR:
-    		return "0..*";
-    	case STAR:
-    		return "*";
-    	default:
-    		return "1";
-    	}
-
-    }
-    
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getUpperMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return "unbounded";
-    	case STAR:
-    		return "unbounded";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "unbounded";
-    	default:
-    		return "unbounded";
-    	}
-	    }
-	
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-	
-    public AbstractClassModel getTypeModel(){
-    	if (getType().isArtifact()
-    			&& !getType().getFullyQualifiedName().startsWith("primitive")
-    			&& ! getType().isPrimitive()){
-    		AbstractClassModel model = ModelFactory.getInstance().getModel(getType().getArtifact());
-    		model.setPluginRef(this.getPluginRef());
-    		return model;
-    	}
-		return null;
-	}
-    
-	/**
-	 * Return true if this has "multiplicity" anything other than SINGLE
-	 */
-	public boolean isMany(){
-		
-		boolean many = this.getType().getTypeMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.STAR);
-		
-		return many;
-	}
-    
-    public boolean isTypePrimitive(){
-    	if(this.getType().isPrimitive() || this.getType().getFullyQualifiedName().startsWith("primitive") || this.getType().getFullyQualifiedName().equals("java.lang.String"))
-    		return true;
-    	else
-    		return false;
-    }
-    
-    public boolean isEnum(){
-    	if(this.getType().isEnum())
-    		return true;
-    		else
-    			return false;
-    }
-    
-
-	public IPluginConfig getPluginRef() {
-		return pluginRef;
-	}
-	
-    
-
-
-
-	public String getDocumentation(String leader, int lineLength, boolean htmlStyle){
-		// split into lines and pre-pend the "leader" on each one.
-
-		// Make the line max of lineLength Chars
-		String newComment = "";
-		if (getComment().length() == 0){
-			return "";
-		}
-		String[] lines = getComment().split("\n");
-		for (String line: lines){
-			line = leader+line;
-			while (line.length() > lineLength){
-				String firstline = line.substring(0,lineLength);
-				String firstLineFullWords = firstline.substring(0,firstline.lastIndexOf(" "));
-				
-				String remains = line.substring(firstLineFullWords.length()+1);
-				newComment = newComment+leader+firstLineFullWords+"\n";
-				line = leader+remains;
-			}
-			newComment = newComment+line;
-		}
-		return newComment;
-	}
-	
-	public String getConfiguredProperty(String property){
-		if (this.getPluginRef().getProperty(property) == null)
-			return "";
-		return (String) this.getPluginRef().getProperty(property).toString();
-	}
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationClassModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationClassModel.java
deleted file mode 100644
index 02d21e9..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationClassModel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-
-
-public class AssociationClassModel extends AssociationModel {
-	
-	IAssociationClassArtifact associationClassArtifact;
-	
-	public AssociationClassModel() {
-		super();
-	}
-
-	public AssociationClassModel(IAbstractArtifact artifact) {
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-	    super.build(artifact);
-	    this.associationClassArtifact = (IAssociationClassArtifact) associationClassArtifact;
-	}
-    //	========= Additional features for UML Associations =====//
-	
-	public Collection getConnectionAssociationEnds(){
-		
-		return getAssociationEnds();
-	}
-
-	
-
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationEndFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationEndFacade.java
deleted file mode 100644
index a8f5548..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationEndFacade.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationEnd;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IRelationship;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationEnd.EAggregationEnum;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationEnd.EChangeableEnum;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-import org.eclipse.tigerstripe.generators.models.AssociationClassModel;
-import org.eclipse.tigerstripe.generators.models.AssociationModel;
-
-
-public class AssociationEndFacade extends AbstractComponentModel {
-
-    private IAssociationEnd end;
-    private AbstractClassModel parentModel;
-
-	
-	public AssociationEndFacade(){
-		super();
-	}
-	
-	public AssociationEndFacade(IAssociationEnd end) {
-		build(end);
-	}
-	
-	public void build(IAssociationEnd end) {
-		super.build(end);
-		this.end = end;
-	}
-	
-	public IType getType(){
-		return end.getType();
-	}
-	
-	/**
-	 * Get the thing that contains this attribute
-	 * @return
-	 */
-	public AssociationModel getAssociation(){
-		AssociationModel model ;
-		if (this.getContainingAssociation() instanceof IAssociationClassArtifact){
-			 model = new AssociationClassModel(this.getContainingArtifact());
-			 model.setPluginRef(this.getPluginRef());
-		} else {
-			 model = new AssociationModel(this.getContainingAssociation());
-			 model.setPluginRef(this.getPluginRef());
-		}
-		model.setPluginRef(getPluginRef());
-		return model;
-	}
-	
-	public EAggregationEnum getEAggregation() {
-		return end.getAggregation();
-	}
-
-	public EChangeableEnum getChangeable() {
-		return end.getChangeable();
-	}
-
-	public EMultiplicity getMultiplicity() {
-		return end.getMultiplicity();
-	}
-	
-	public java.lang.String getDocMultiplicity(){
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0..1";
-    	case ZERO_STAR:
-    		return "0..*";
-    	case STAR:
-    		return "*";
-    	default:
-    		return "1";
-    	}
-
-    }
-	
-    public java.lang.String getLowerMultiplicity(){
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-    
-	public java.lang.String getUpperMultiplicity(){
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return "unbounded";
-    	case STAR:
-    		return "unbounded";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "unbounded";
-    	default:
-    		return "unbounded";
-    	}
-	    }
-
-	
-	public java.lang.String getUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-
-
-
-	public boolean isNavigable() {
-		return end.isNavigable();
-	}
-
-	public boolean isOrdered() {
-		return end.isOrdered();
-	}
-	
-	public boolean isOptional() {
-		return this.getLowerMultiplicity().equals("0");
-	}
-	
-	public boolean isRequired() {
-		
-		return !isOptional();
-	}
-	
-	public boolean isField(){
-		return false;
-	}
-
-	public IAbstractArtifact getContainingAssociation() {
-		return this.end.getContainingAssociation();
-	}
-	
-	public IAbstractArtifact getContainingArtifact() {
-		return this.end.getContainingAssociation();
-	}
-	
-	public IRelationship getContainingRelationship() {
-		return this.end.getContainingRelationship();
-	}
-
-
-	public boolean isUnique() {
-		return this.end.isUnique();
-	}
-
-	
-	public AbstractClassModel getTypeModel() {
-		if (getType().isArtifact() && !getType().getFullyQualifiedName().startsWith("primitive") ){
-    		AbstractClassModel type = ModelFactory.getInstance().getModel(getType().getArtifact());
-    		type.setPluginRef(this.getPluginRef());
-    		return type;
-		}
-		//AbstractClassModel type = new AbstractClassModel();
-		return null;
-	}
-	
-	public AssociationEndFacade getOtherEnd(){
-		AssociationEndFacade oEnd = new AssociationEndFacade( (IAssociationEnd) this.end.getOtherEnd());
-		oEnd.setPluginRef(this.getPluginRef());
-		oEnd.setParentModel(this.getParentModel());
-		return oEnd;
-		
-	}
-    
-	
-	
-	public boolean isComposition(){
-		return this.end.getAggregation().equals(EAggregationEnum.COMPOSITE);		
-	}
-	
-	public boolean isAggregation() {
-		return this.end.getAggregation().equals(EAggregationEnum.SHARED);
-	}
-	
-	public boolean isOne2One(){
-		boolean one = this.end.getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-			this.end.getMultiplicity().equals(EMultiplicity.ONE);
-		boolean otherOne = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-			getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE);;
-		return one && otherOne;
-	}
-	
-    public boolean isOne2Many(){
-    	boolean one = this.end.getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-			this.end.getMultiplicity().equals(EMultiplicity.ONE);
-    	boolean otherMany = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    	    getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    	    getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.STAR);
-        	
-    	return one && otherMany;
-	}
-	
-    public boolean isMany(){
-    	boolean many = this.getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    		this.getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    		this.getMultiplicity().equals(EMultiplicity.STAR);
-    	return many;
-	}
-    
-    
-    public boolean isMany2One(){
-    	boolean many = this.end.getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.STAR);
-    	boolean otherOne = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-		getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE);;
-    	return many & otherOne;
-	}
-    
-    public boolean isMany2Many(){
-    	boolean many = this.end.getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.STAR);
-    	boolean otherMany = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-	    	getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-	    	getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.STAR);
-    	return many & otherMany;
-	}
-    
-    
-
-	public IAssociationEnd getAssociationEnd() {
-		return end;
-	}
-
-    
-    public boolean isAssociationEnd(){
-    	return true;
-    }
-    
-
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-
-		
-	@Override
-	public IPluginConfig getPluginRef() {
-		return this.getParentModel().getPluginRef();
-	}
-    
-}
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationModel.java
deleted file mode 100644
index fdaf054..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationModel.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-
-
-public class AssociationModel extends AbstractClassModel {
-	
-	private IAssociationArtifact association;
-	
-	public AssociationModel() {
-		super();
-	}
-
-	public AssociationModel(IAbstractArtifact artifact) {
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-	    super.build(artifact);
-	    this.association = (IAssociationArtifact) artifact;
-	}
-	
-	public AssociationEndFacade getAEnd(){
-		AssociationEndFacade end = new AssociationEndFacade(this.association.getAEnd());
-		end.setParentModel(this);
-		return end;
-	}
-	
-	public AssociationEndFacade getZEnd(){
-		AssociationEndFacade end = new AssociationEndFacade(this.association.getZEnd());
-		end.setParentModel(this);
-		return end;
-	}
-	
-    //	========= Additional features for UML Associations =====//
-	
-	public Collection getAssociationEnds(){
-		ArrayList ends= new ArrayList();
-		ends.add( getAEnd() );
-		ends.add( getZEnd() );
-		return ends;
-	}
-	
-	public AssociationEndFacade getAssociationEndA(){
-		return getAEnd();
-	}
-	
-	public AssociationEndFacade getAssociationEndB(){
-		return getZEnd();
-	}
-    
-}
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DatatypeModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DatatypeModel.java
deleted file mode 100644
index 9f08190..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DatatypeModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-
-
-public class DatatypeModel extends AbstractClassModel {
-
-	private IDatatypeArtifact datatypeArtifact;
-	
-	public DatatypeModel() {
-	}
-	
-	public DatatypeModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.datatypeArtifact = (IDatatypeArtifact) artifact;
-	}
-    
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DependencyModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DependencyModel.java
deleted file mode 100644
index 61d5c22..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DependencyModel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-
-
-
-public class DependencyModel extends AbstractClassModel {
-
-	
-	private IDependencyArtifact dependencyArtifact;
-	
-	public DependencyModel() {
-	}
-	
-	public DependencyModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.dependencyArtifact = (IDependencyArtifact) artifact;
-	}
-	
-	public String getAEndType(){
-		return dependencyArtifact.getAEndType().getFullyQualifiedName();
-	}
-	
-	public String getZEndType(){
-		return dependencyArtifact.getZEndType().getFullyQualifiedName();
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/EnumerationModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/EnumerationModel.java
deleted file mode 100644
index 5a55a3d..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/EnumerationModel.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ILiteral;
-
-
-public class EnumerationModel extends AbstractClassModel {
-	
-	private IEnumArtifact enumArtifact;
-	
-	public EnumerationModel() {
-	}
-
-	public EnumerationModel(IAbstractArtifact artifact) {
-		build(artifact);
-	}
-	
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.enumArtifact = (IEnumArtifact) artifact;
-	}
-	
-	public String getBaseTypeStr(){
-		return enumArtifact.getBaseTypeStr();
-	}
-	
-    //	========= Additional features for UML Enumerations =====//
-
-	/** 
-	 * rename & recast for getLabels 
-	 * 
-	 */
-	public Collection getLiterals(){
-		Collection<LabelFacade> facades = new ArrayList<LabelFacade>();
-		for (ILiteral literal : getArtifact().getLiterals(true)){
-			
-			LabelFacade facade = new LabelFacade( literal );
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ExceptionModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ExceptionModel.java
deleted file mode 100644
index 2937995..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ExceptionModel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact;
-
-
-
-public class ExceptionModel extends AbstractClassModel {
-
-	private IExceptionArtifact exceptionArtifact;
-	
-	public ExceptionModel() {
-	}
-
-	
-	public ExceptionModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-	
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.exceptionArtifact = (IExceptionArtifact) artifact;
-	}
-    
-    public AbstractClassModel getGeneralization(){
-    	IExceptionArtifact bob = this.exceptionArtifact;
-    	if (bob.getExtendedArtifact() != null){
-			AbstractClassModel acm = ModelFactory.getInstance().getModel(bob.getExtendedArtifact());
-			acm.setPluginRef(this.getPluginRef());
-			if(acm.getFullyQualifiedName().equals("java.lang.Exception"))
-			return null;
-			else
-			return acm;
-		} else {
-			return null; 
-		}	 
-    }
-    
-}
-
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/FieldFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/FieldFacade.java
deleted file mode 100644
index 55fb72b..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/FieldFacade.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IField;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-
-public class FieldFacade extends AbstractComponentModel {
-
-	private IField field;
-	private AbstractClassModel parentModel;
-	
-	public FieldFacade(){
-		super();
-	}
-	
-	public FieldFacade(IField field) {
-		build(field);
-	}
-	
-	public void build(IField field) {
-		super.build(field);
-		this.field = field;
-	}
-	
-	public IType getType() {
-		return field.getType();
-	}
-
-
-	public boolean isOptional() {
-		return this.getLowerMultiplicity().equals("0");
-	}
-
-	public boolean isReadOnly() {
-		return field.isReadOnly();
-	}
-	
-	public IAbstractArtifact getContainingArtifact() {
-		return this.field.getContainingArtifact();
-	}
-	
-
-	public boolean isOrdered() {
-		return this.field.isOrdered();
-	}
-
-	public boolean isUnique() {
-		return this.field.isUnique();
-	}
-	
-	
-	public String getFullyQualifiedName(){
-		
-		return this.getContainingArtifact().getFullyQualifiedName() + "." + super.getName();
-
-	}
-
-	
-	/**
-	 * Return true if this has "multiplicity" anything other than SINGLE
-	 */
-	public boolean isMany(){
-		
-		boolean many = this.getType().getTypeMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.STAR);
-		
-		return many;
-	}
-    
-    
-    public AbstractClassModel getTypeModel(){
-    	if (getType().isArtifact()
-    			&& !getType().getFullyQualifiedName().startsWith("primitive") 
-    			&& !getType().isPrimitive() ){
-    		AbstractClassModel model = ModelFactory.getInstance().getModel(getType().getArtifact());
-    		model.setPluginRef(this.getPluginRef());
-    		return model;
-    	}
-		return null;
-	}  
-	
-	/**
-	 * The opposite of isOptional
-	 * 
-	 * @return
-	 */
-	public boolean isRequired(){
-		return !isOptional();
-	}	
-	
-	
-	/**
-	 * String based on the value of "defaultValue" stereotype
-	 * 
-	 * @return
-	 */
-	public String getDefaultValue(){
-		if (isDefaultValuePresent()){
-			return field.getDefaultValue();
-		} else
-			return null;
-	}
-	
-	/**
-	 * String based on the presence of "defaultValue" stereotype
-	 * 
-	 * @return
-	 */
-	public boolean isDefaultValuePresent(){
-		return (field.getDefaultValue() != null );
-	}
-
-	/**
-	* "Getter" for lowerMultiplicity.
-	* No comment found in UML.
-	*/
-    public java.lang.String getLowerMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	* 
-	* NOTE - Better the use the typed version below!
-	*/
-	public java.lang.String getUpperMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return "unbounded";
-    	case STAR:
-    		return "unbounded";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "unbounded";
-    	default:
-    		return "unbounded";
-    	}
-	    }
-	
-	public java.lang.String getMultiplicity(){
-		EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0..1";
-    	case ZERO_STAR:
-    		return "*";
-    	case STAR:
-    		return "*";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "1..*";
-    	default:
-    		return "unknown";
-    	}
-	}
-	
-	
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-
-	public boolean isField(){
-		return true;
-	}
-	
-	
-	public String toString(){
-		return this.getClass().getName()+"["+field.getName()+"]";
-	}
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-
-	public AbstractClassModel getOwner(){
-		AbstractClassModel model = ModelFactory.getInstance().getModel(field.getContainingArtifact());
-		model.setPluginRef(this.getPluginRef());
-		return model;
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/LabelFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/LabelFacade.java
deleted file mode 100644
index 0db03c6..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/LabelFacade.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ILiteral;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-
-public class LabelFacade extends AbstractComponentModel {
-	
-	private ILiteral label;
-	private AbstractClassModel parentModel;
-	
-	public LabelFacade(){
-	}
-	
-	public LabelFacade(ILiteral label) {
-		build(label);
-	}
-	
-	public void build(ILiteral label) {
-		super.build(label);
-		this.label = label;
-	}
-	
-	public IType getIextType() {
-		return label.getType();
-	}
-
-
-	public String getValue() {
-		return label.getValue();
-	}
-	
-	
-	public IAbstractArtifact getContainingArtifact() {
-		return this.label.getContainingArtifact();
-	}
-
-
-	
-	public int getIndexValue() {
-		int ret = -1;
-		//Object o = this.findTaggedValue("EnumValue");
-		Object o = getValue();
-		if (o != null) {
-			ret = Integer.parseInt(o.toString());
-		}
-		return ret;
-	}
-	
-	public AbstractClassModel getOwner(){
-		AbstractClassModel model = ModelFactory.getInstance().getModel(label.getContainingArtifact());
-		model.setPluginRef(this.getPluginRef());
-		return model;
-	}
-	
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ManagedEntityModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ManagedEntityModel.java
deleted file mode 100644
index 1741051..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ManagedEntityModel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-
-
-public class ManagedEntityModel extends AbstractClassModel {
-		
-	private IManagedEntityArtifact managedEntityArtifact;
-
-	public ManagedEntityModel() {
-		super();
-	}
-	
-	public ManagedEntityModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.managedEntityArtifact = (IManagedEntityArtifact) artifact;
-	}
-    
-    
-    
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/MethodFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/MethodFacade.java
deleted file mode 100644
index 20ab6e5..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/MethodFacade.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IArgument;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-import org.eclipse.tigerstripe.workbench.profile.stereotype.IStereotypeInstance;
-
-public class MethodFacade extends AbstractComponentModel {
-
-	
-	private IMethod method;
-	
-	private AbstractClassModel parentModel;
-
-	public MethodFacade(){
-		super();
-	}
-
-	public MethodFacade(IMethod method) {
-		build(method);
-	}
-
-	public void build(IMethod method) {
-		super.build(method);
-		this.method = method;
-	}
-	
-	public Collection<IArgument> getArguments() {
-		return method.getArguments();
-	}
-
-	public String getMethodId() {
-		return method.getMethodId();
-	}
-
-	public boolean isMethod() {
-		return true;
-	}
-	
-	public IType getReturnType() {
-		return method.getReturnType();
-	}
-
-	public boolean isVoid() {
-		return method.isVoid();
-	}
-
-	public IAbstractArtifact getContainingArtifact() {
-		return this.method.getContainingArtifact();
-	}
-	
-	public String getDefaultReturnValue() {
-		return this.method.getDefaultReturnValue();
-	}
-
-	public boolean isAbstract() {
-		return this.method.isAbstract();
-	}
-
-	public boolean isOrdered() {
-		return this.method.isOrdered();
-	}
-
-	public boolean isUnique() {
-		return this.method.isUnique();
-	}
-    
-	public String getReturnName(){
-		return getMethodReturnName();
-	}
-	
-	public String getMethodReturnName() {
-		return this.method.getReturnName();
-	}
-
-	public Collection<IStereotypeInstance> getReturnStereotypeInstances() {
-		return this.method.getReturnStereotypeInstances();
-	}
-	
-	
-	/**
-	 * Return true if this has "multiplicity" anything other than SINGLE
-	 */
-	public boolean returnIsMany(){
-		
-		boolean many = this.getReturnType().getTypeMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-		this.getReturnType().getTypeMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-		this.getReturnType().getTypeMultiplicity().equals(EMultiplicity.STAR);
-		
-		return many;
-	}
-	
-	
-	
-	public String getPackage(){
-		return getContainingArtifact().getPackage();
-	}
-	
-	
-	
-	
-	public boolean returnParameterHasStereotype( String stereotypeName){
-		if(this.getReturnStereotypeInstances() != null){
-		Collection<IStereotypeInstance> stereos = this.getReturnStereotypeInstances();
-		for (IStereotypeInstance stereo : stereos){
-			if (stereo.getName().equals(stereotypeName)) {
-					return true;
-			}
-		}
-		return false;
-		}
-		return false;
-	}
-
-
-	
-	public boolean isReturnTypePresent(){
-		return !isVoid();
-	}
-	
-	
-	
-	public  Collection getExceptions() {
-		Collection<AbstractClassModel> facades = new ArrayList<AbstractClassModel>();
-		for (IException exception : method.getExceptions()){
-			AbstractClassModel facade = ModelFactory.getInstance().getModel(exception);
-			if (facade != null){
-				facade.setPluginRef(this.getPluginRef());
-				facades.add(facade);
-			}
-		}
-		return facades;
-	}
-	
-	public boolean isExceptionsPresent(){
-		if (method.getExceptions().size() == 0){
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	/**
-	 * Formatted String list of the exceptions
-	 * @return
-	 */
-	public String getExceptionList(){
-		String outString = "";
-		String comma = " ";
-		Iterator it = method.getExceptions().iterator();
-		while (it.hasNext()){
-		    IException exception = (IException) it.next();
-			
-			outString = outString + comma+exception.getName() ;
-			if (it.hasNext()){
-				outString = outString +"\n"; 
-			}
-			comma = ",";
-		}
-		
-	
-		return outString;
-	}
-	
-	/**
-	 * Formatted string of the method signature
-	 * @return
-	 */
-	public String getSignature(){
-		String sig = "";
-		sig = method.getName()+"(";
-		sig = sig + getTypedArgumentList();
-		sig = sig+")";
-		return sig;
-	}
-
-	/** 
-	 * rename & recast for getIextArguments 
-	 * 
-	 */
-	public Collection getParameters(){
-		Collection<ArgumentFacade> facades = new ArrayList<ArgumentFacade>();
-		for (IArgument arg : getArguments()){
-			ArgumentFacade facade = new ArgumentFacade( arg);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this.getParentModel());
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	/**
-	 * Formatted list of the arguments & types
-	 * @return
-	 */
-	public String getTypedArgumentList(){
-		String argList = "";
-		String comma = " ";
-		int arg =0;
-		for (IArgument argument : method.getArguments()){
-			argList = argList + comma + argument.getType().getFullyQualifiedName()
-				+ " arg"+arg;
-			comma = "        ,\n";
-			arg++;
-		}
-		return argList;
-	}
-	
-	
-	public AbstractClassModel getOwner(){
-		AbstractClassModel model = ModelFactory.getInstance().getModel(method.getContainingArtifact());
-		model.setPluginRef(this.getPluginRef());
-		return model;
-	}
-	
-	
-	public AbstractClassModel getReturnTypeModel(){
-		if (getReturnType().isArtifact() 
-				&& !getReturnType().getFullyQualifiedName().startsWith("primitive")
-				&& ! getReturnType().isPrimitive()){
-    		AbstractClassModel model = ModelFactory.getInstance().getModel(getReturnType().getArtifact());
-    		model.setPluginRef(this.getPluginRef());
-    		return model;
-    	}
-		return null;
-	}
-	
-
-	public boolean hasReturnExactStereotype( String stereotypeName){
-
-		Collection<IStereotypeInstance> stereos = getReturnStereotypeInstances();
-		for (IStereotypeInstance stereo :stereos){
-			if (stereo.getName().equals(stereotypeName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getReturnUpperMultiplicity(){
-		EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-		switch (multi) {
-		case ZERO:
-			return "0";
-		case ZERO_ONE:
-			return "1";
-		case ZERO_STAR:
-			return "unbounded";
-		case STAR:
-			return "unbounded";
-		case ONE:
-			return "1";
-		case ONE_STAR:
-			return "unbounded";
-		default:
-			return "unbounded";
-		}
-	    }
-	
-	public java.lang.String getReturnMultiplicity(){
-		EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-		switch (multi) {
-		case ZERO:
-			return "0";
-		case ZERO_ONE:
-			return "0..1";
-		case ZERO_STAR:
-			return "0..*";
-		case STAR:
-			return "*";
-		case ONE:
-			return "1";
-		case ONE_STAR:
-			return "1..*";
-		default:
-			return "unknown";
-		}
-	    }
-	
-	public boolean isReturnMultiMany(){
-		EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-		switch (multi) {
-		case ZERO:
-			return false;
-		case ZERO_ONE:
-			return false;
-		case ZERO_STAR:
-			return true;
-		case STAR:
-			return true;
-		case ONE:
-			return false;
-		case ONE_STAR:
-			return true;
-		default:
-			return false;
-		}
-	}
-	
-	
-	public java.lang.String getReturnUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-	
-	
-	/**
-	* "Getter" for lowerMultiplicity.
-	* No comment found in UML.
-	*/
-    public java.lang.String getReturnLowerMultiplicity(){
-    	EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-    
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-    
-    
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ModelFactory.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ModelFactory.java
deleted file mode 100644
index bc89db3..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ModelFactory.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEventArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IUpdateProcedureArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IException;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-
-import org.eclipse.tigerstripe.generators.utils.DocUtils;
-
-public class ModelFactory{
-
-	private static ModelFactory instance;
-	
-	/**
-	 * A Private Map that keeps track of all of the instances created
-	 */
-	private Map<String, AbstractClassModel> modelMap = new HashMap<String, AbstractClassModel>();
-
-	private ModelFactory() {
-	}
-
-	public static ModelFactory getInstance() {
-		if (instance == null) {
-			instance = new ModelFactory();
-		}
-		return instance;
-	}
-
-   public AbstractClassModel getModel(IAbstractArtifact artifact){
-	   
-	   /** See if it already exists */
-	   if (modelMap.containsKey(artifact.getFullyQualifiedName())){
-		   return modelMap.get(artifact.getFullyQualifiedName());
-	   }
-	   // Else create a new one
-	   AbstractClassModel newModel;
-	   if (artifact instanceof IAssociationClassArtifact){
-		   newModel = new AssociationClassModel(artifact);
-	   } else if (artifact instanceof IAssociationArtifact){
-		   newModel = new AssociationModel(artifact);
-	   } else if (artifact instanceof IDatatypeArtifact){
-		   newModel = new DatatypeModel(artifact);
-	   } else if (artifact instanceof IManagedEntityArtifact){
-		   newModel = new ManagedEntityModel(artifact);
-	   } else if (artifact instanceof IEnumArtifact){
-		   newModel = new EnumerationModel(artifact);
-	   }else if (artifact instanceof ISessionArtifact){
-		   newModel = new SessionModel(artifact);
-	   }else if (artifact instanceof IExceptionArtifact){
-		   newModel = new ExceptionModel(artifact);
-	   }else if (artifact instanceof IDependencyArtifact){
-		   newModel = new DependencyModel(artifact);
-	   }else if (artifact instanceof IQueryArtifact){
-		   newModel = new QueryModel(artifact);
-	   }else if (artifact instanceof IUpdateProcedureArtifact){
-		   newModel = new UpdateProcedureModel(artifact);
-	   }else if (artifact instanceof IEventArtifact){
-		   newModel = new NotificationModel(artifact);
-	   } else {
-		   PluginLog.logError("ModelFactory : Unknown artifact type for "+artifact.getFullyQualifiedName());
-		   newModel = null;
-	   }
-	   modelMap.put(artifact.getFullyQualifiedName(), newModel);
-	   return newModel;
-   }   
-
-   /**
-    * Special case for creating an exceptionModel from anIextException (which is not an artifact)
-    * 
-    * @param exception
-    * @return
-    */
-   public AbstractClassModel getModel(IException exception){
-	   
-	   /** See if it already exists */
-	   if (modelMap.containsKey(exception.getFullyQualifiedName())){
-		   return modelMap.get(exception.getFullyQualifiedName());
-	   }
-	       IArtifactManagerSession managerSession = DocUtils.getManagerSession();
-	       if (managerSession != null){
-	    	   IExceptionArtifact artifact = (IExceptionArtifact) managerSession.getArtifactByFullyQualifiedName(exception.getFullyQualifiedName(),true);
-	    	   if (artifact != null){
-	    		   ExceptionModel newModel = new ExceptionModel(artifact);
-	    		   modelMap.put(artifact.getFullyQualifiedName(), newModel);
-	    		   return newModel;
-	    	   }
-	       }
-	       // This will return null if there is not an artifact for this exception
-	       PluginLog.logWarning("ModelFactory : No artifact type for exception"+exception.getFullyQualifiedName());
-	       return null;
-		   
-   }
-}
-
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/NotificationModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/NotificationModel.java
deleted file mode 100644
index 518925f..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/NotificationModel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEventArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact;
-
-
-public class NotificationModel extends AbstractClassModel {
-
-	private IEventArtifact notificationArtifact;
-	
-	public NotificationModel() {
-	}
-	
-	public NotificationModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.notificationArtifact = (IEventArtifact) artifact;
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/PackageModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/PackageModel.java
deleted file mode 100644
index d326ff7..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/PackageModel.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.generators.utils.DocUtils;
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactModel;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
-import org.eclipse.tigerstripe.workbench.queries.IArtifactQuery;
-import org.eclipse.tigerstripe.workbench.queries.IQueryAllArtifacts;
-
-import org.eclipse.tigerstripe.generators.models.AbstractClassModel;
-import org.eclipse.tigerstripe.generators.models.ModelFactory;
-
-/**
- * This class is used to "spoof" a package when a rule needs to run over all artifacts 
- * in a given package.
- * 
- * The package is taken from the artifact that is passed in the setIArtifact.
- * 
- * When this is used in a rule, the rule should be set to not overwrite to prevent 
- * unnecessary processing.
- * 
- *
- */
-public class PackageModel implements IArtifactModel{
-
-	private IAbstractArtifact artifact;
-	private IPluginConfig pluginRef;
-
-	private String fullyQualifiedName;
-	
-	public PackageModel(){
-		
-	}
-	
-	public void setIArtifact(IAbstractArtifact artifact) {
-		this.artifact = artifact;
-		this.fullyQualifiedName = artifact.getPackage();
-	}
-
-	public void setPluginConfig(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-		
-	}
-
-	public String getFullyQualifiedName() {
-		return fullyQualifiedName;
-	}
-
-	public String getName() {
-		return getFullyQualifiedName().substring(getFullyQualifiedName().lastIndexOf(".")+1);
-	}
-	
-	/**
-	 * This will do a lot of work every time called. If necessary it could be made more efficient?
-	 * 
-	 * @return
-	 */
-	public Collection<AbstractClassModel> getOwnedElements(Collection<PackageModel> allArtifacts){
-		PluginLog.logDebug("does it make it here");
-		ArrayList<AbstractClassModel> ownedElements = new ArrayList<AbstractClassModel>();
-		try {
-			//ITigerstripeModelProject project = artifact.getTigerstripeProject();
-			//IArtifactManagerSession session = project.getArtifactManagerSession();
-			//IArtifactQuery query = session.makeQuery(IQueryAllArtifacts.class.getName());
-			//Collection allArtifacts = session.queryArtifact(query);
-			for (Object art : allArtifacts){
-				IAbstractArtifact localArtifact = (IAbstractArtifact) art;
-				if (localArtifact.getPackage().equals(getFullyQualifiedName())){
-					PluginLog.logDebug("Adding "+localArtifact.getName()+ " to ownedElements of "+getFullyQualifiedName());
-					AbstractClassModel model = ModelFactory.getInstance().getModel(localArtifact);
-					model.setPluginRef(this.pluginRef);
-					ownedElements.add(model);
-				}
-				
-			}
-		} catch (NullPointerException n){
-			PluginLog.logError("Failure to read package artifacts - no project");
-		} //catch (TigerstripeException t){
-		//	PluginLog.logError("Failure to read package artifacts",t);
-		//}
-		return ownedElements;
-
-	}
-	
-	public String getHash(){
-		return DocUtils.getHash(getFullyQualifiedName());
-	}
-
-	public Collection<PackageModel> getSubPackages(){
-		ArrayList<PackageModel> subPackages = new ArrayList<PackageModel>();
-		ArrayList<String> subPackageNames = new ArrayList<String>();
-		
-		try {
-			// This *might* not work for a project with dependencies
-			ITigerstripeModelProject project = artifact.getTigerstripeProject();
-			IArtifactManagerSession session = project.getArtifactManagerSession();
-			IArtifactQuery query = session.makeQuery(IQueryAllArtifacts.class.getName());
-			Collection allArtifacts = session.queryArtifact(query);
-			for (Object art : allArtifacts){
-				IAbstractArtifact localArtifact = (IAbstractArtifact) art;
-				if (localArtifact.getPackage().startsWith(getFullyQualifiedName())){
-					String subPackage = localArtifact.getPackage().replaceFirst(getFullyQualifiedName(), "");
-			
-					if ( subPackage.length() > 0 ){
-						// We need to add a new subPackage here
-						String newPackageName = subPackage.substring(1);
-						if (newPackageName.contains(".")){
-							newPackageName = newPackageName.substring(0,newPackageName.indexOf("."));
-						}
-						
-						if (!subPackageNames.contains(newPackageName)){
-							// There might be no artifact at this level of the hierarchy, so set the name directly
-							PluginLog.logDebug("Adding "+newPackageName+ " to subPackages of "+getFullyQualifiedName());
-							PackageModel model = new PackageModel();
-							model.setIArtifact(localArtifact);
-							// Must do this AFTER setting the artifact
-							model.setFullyQualifiedName(getFullyQualifiedName()+"."+newPackageName);
-							model.setPluginConfig(this.pluginRef);
-							subPackages.add(model);
-							subPackageNames.add(newPackageName);
-						}
-					}
-					
-				}
-				
-			}
-		} catch (NullPointerException n){
-			PluginLog.logError("Failure to read package artifacts - no project");
-		} catch (TigerstripeException t){
-			PluginLog.logError("Failure to read package artifacts",t);
-		}
-		return subPackages;
-	}
-
-	private void setFullyQualifiedName(String fullyQualifiedName) {
-		this.fullyQualifiedName = fullyQualifiedName;
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/QueryModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/QueryModel.java
deleted file mode 100644
index 80382be..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/QueryModel.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact;
-
-
-public class QueryModel extends AbstractClassModel {
-
-	private IQueryArtifact queryArtifact;
-	
-	public QueryModel() {
-	}
-	
-	public QueryModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.queryArtifact = (IQueryArtifact) artifact;
-	}
-	
-	public String getReturnedType(){
-		if (this.queryArtifact.getReturnedType() != null ){
-			AbstractClassModel acm = ModelFactory.getInstance().getModel(this.queryArtifact.getReturnedType().getArtifact());
-			acm.setPluginRef(this.getPluginRef());
-			return acm.getFullyQualifiedName();
-		} else {
-			return null;
-		}
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/SessionModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/SessionModel.java
deleted file mode 100644
index 18f70a5..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/SessionModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact;
-
-public class SessionModel extends AbstractClassModel {
-	
-	private ISessionArtifact sessionArtifact;
-	
-	public SessionModel(){}
-	
-	public SessionModel(IAbstractArtifact artifact){
-		build(artifact);
-	}
-	
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.sessionArtifact = (ISessionArtifact) artifact;
-	}
-	
-
-    public boolean isInterface(){
-    	return true;
-    }
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/UpdateProcedureModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/UpdateProcedureModel.java
deleted file mode 100644
index 21b3f90..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/UpdateProcedureModel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IUpdateProcedureArtifact;
-
-
-
-public class UpdateProcedureModel extends AbstractClassModel {
-
-	private IUpdateProcedureArtifact updateProcedureArtifact;
-	
-	public UpdateProcedureModel() {
-	}
-	
-	public UpdateProcedureModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.updateProcedureArtifact = (IUpdateProcedureArtifact) artifact;
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/CastUtils.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/CastUtils.java
deleted file mode 100644
index 963ffb6..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/CastUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-import org.eclipse.tigerstripe.generators.models.AbstractClassModel;
-import org.eclipse.tigerstripe.generators.models.ModelFactory;
-
-
-public class CastUtils {
-
-	private LegacyFilter legacyFilter = new LegacyFilter();
-
-	private IPluginConfig pluginRef = null;
-
-
-	public Collection toModel(Collection<IAbstractArtifact> artifacts){
-		ArrayList<AbstractClassModel> outCollection = new ArrayList<AbstractClassModel>();
-		for (IAbstractArtifact artifact : artifacts){
-			if (legacyFilter.select(artifact)){
-				AbstractClassModel model = ModelFactory.getInstance().getModel(artifact);
-				if (model != null){
-					model.setPluginRef(pluginRef);
-					outCollection.add( model);
-				}
-			}
-		}
-		return outCollection;
-	}	
-
-	public void setPluginRef(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-	}
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocPackage.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocPackage.java
deleted file mode 100644
index 4db4f3f..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocPackage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-
-
-public class DocPackage {
-
-	private String fullyQualifiedName;
-	public  boolean elements = false;
-	private Map<String,DocPackage> subPackageMap = new HashMap<String,DocPackage>();
-	
-	
-	public String getFullyQualifiedName() {
-		return this.fullyQualifiedName;
-	}
-	
-	public String getName() {
-		return getFullyQualifiedName().substring(getFullyQualifiedName().lastIndexOf(".")+1);
-	}
-	
-	public void setFullyQualifiedName(String fqn) {
-		this.fullyQualifiedName = fqn;
-	}
-	
-	public Collection<DocPackage> getSubPackages() {
-		return DocUtils.sortByName(subPackageMap.values());
-	}
-	public void addSubPackage(DocPackage packageToAdd) {
-		if (! subPackageMap.containsKey(packageToAdd.getFullyQualifiedName())){
-			PluginLog.logDebug("Adding sub package"+packageToAdd.getFullyQualifiedName()+ " to "+getFullyQualifiedName());
-			subPackageMap.put(packageToAdd.getFullyQualifiedName(), packageToAdd);
-		}
-	}
-
-	public boolean hasElements() {
-		return elements;
-	}
-
-	public void setElements(boolean elements) {
-		
-		this.elements = elements;
-	}
-	
-	
-	
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocUtils.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocUtils.java
deleted file mode 100644
index ed8b040..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocUtils.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.queries.IArtifactQuery;
-import org.eclipse.tigerstripe.workbench.queries.IQueryAllArtifacts;
-
-import org.eclipse.tigerstripe.generators.models.AssociationEndFacade;
-import org.eclipse.tigerstripe.generators.utils.LegacyFilter;
-
-import org.eclipse.tigerstripe.generators.models.AbstractComponentModel;
-import org.eclipse.tigerstripe.generators.models.ArgumentFacade;
-
-public class DocUtils
-{
-
-	private static IArtifactManagerSession managerSession;
-	
-	public static IArtifactManagerSession getManagerSession() {
-		return managerSession;
-	}
-
-
-	/**
-	 * Generate a simple hash based on a string
-	 */
-	public static String getHash(String input){
-		long h =0;
-		for (int i=0;i<input.length();i++){
-			h=(h<<2L) + Character.getNumericValue(input.charAt(i));
-		}
-		PluginLog.logTrace("Getting hash for "+input+ " : Returning "+Long.toHexString(h));
-		return Long.toHexString(h);
-	}
-
-	public static Collection<DocPackage> getRootPackages(IArtifactManagerSession session, Collection<Object> allArtifacts){
-		Map<String, DocPackage> packageMap = new HashMap<String, DocPackage>();
-		try {
-			//IArtifactQuery query = session.makeQuery(IQueryAllArtifacts.class.getName());
-			//Collection allArtifacts = session.queryArtifact(query);
-			// Filter out legacy artifacts
-			for (Object art : allArtifacts){
-				//LegacyFilter filter = new LegacyFilter();
-				IAbstractArtifact localArtifact = (IAbstractArtifact) art;
-				//if (filter.select(localArtifact) && ! localArtifact.getPackage().equals("primitive")){
-				//if (localArtifact.getTigerstripeProject() != null && ! localArtifact.getPackage().equals("primitive")){
-				if (! localArtifact.getPackage().equals("primitive")){
-				String localPackageName = localArtifact.getPackage();
-				DocPackage myPackage;
-				if (! packageMap.containsKey(localPackageName)){
-					// make a new DocPackage
-					
-					// Also check/make all parent elements
-					String[] segments = localPackageName.split("\\.");
-					
-					String prev = "";
-					DocPackage parent = null;
-					DocPackage segmentPackage;
-					for (String segment : segments){
-						String name = prev+segment;
-
-						if (! packageMap.containsKey(name)){
-							segmentPackage= new DocPackage();
-							segmentPackage.setFullyQualifiedName(name);
-							packageMap.put(name, segmentPackage);
-						} else {
-							segmentPackage = packageMap.get(name);
-						}
-						if (parent != null){
-							parent.addSubPackage(segmentPackage);
-						}
-						prev = name + ".";
-						parent = segmentPackage;
-					}
-					// myPackage will be the last one.
-					myPackage = parent;
-				} else {
-					myPackage = packageMap.get(localPackageName);
-				}
-				
-				if (localArtifact instanceof IAbstractArtifact
-						
-						){
-					myPackage.setElements(true);
-				}
-				
-				}
-				
-			}
-		} catch (Exception e){
-			PluginLog.logError("Failure to query artifacts",e);
-		}
-
-		Collection<DocPackage> packages = sortDocPackageByName(packageMap.values());
-		Collection<DocPackage> rootPackages = new ArrayList<DocPackage>();
-		for (DocPackage p : packages){
-			if (!p.getFullyQualifiedName().contains(".")){
-				rootPackages.add(p);
-			}
-		}
-		return rootPackages;
-
-	}
-	
-	public static Collection<DocPackage> sortDocPackageByName(Collection packages) {
-    	ArrayList sorted = new ArrayList();
-
-        if (packages != null) {
-        	sorted.addAll(packages);
-	        	Collections.sort (sorted, new java.util.Comparator() {
-	            public int compare(Object arg0, Object arg1) 
-	            {
-	                if (arg0 instanceof DocPackage
-	                        && arg1 instanceof DocPackage) {
-	                	DocPackage a = (DocPackage) arg0;
-	                	DocPackage b = (DocPackage) arg1;
-	                    return a.getFullyQualifiedName().compareTo(b.getFullyQualifiedName());
-	                } else {
-	                	return 0;
-
-	                }
-	            }
-	        });
-        }
-	  	return sorted;
-
-    }
-	
-    public String getMultiplicityString(AssociationEndFacade end){
-        String ret = "";
-        ret = end.getMultiplicity().getLabel();
-        return ret;
-    }
-    
-    public static Collection sortByName(Collection attrs){
-    	ArrayList sorted = new ArrayList();
-
-        if (attrs != null) {
-        	sorted.addAll(attrs);
-	        	Collections.sort (sorted, new java.util.Comparator() {
-	            public int compare(Object arg0, Object arg1) 
-	            {
-	                if (arg0 instanceof AbstractComponentModel
-	                        && arg1 instanceof AbstractComponentModel) {
-	                	AbstractComponentModel a = (AbstractComponentModel) arg0;
-	                	AbstractComponentModel b = (AbstractComponentModel) arg1;
-	                    return a.getName().compareTo(b.getName());
-	                } else if (arg0 instanceof ArgumentFacade
-	                		&& arg1 instanceof ArgumentFacade) {
-	                	ArgumentFacade a = (ArgumentFacade) arg0;
-	                	ArgumentFacade b = (ArgumentFacade) arg1;
-	                	return a.getName().compareTo(b.getName());
-	                } else {
-	                	return 0;
-	                }
-	            }
-	        });
-        }
-	  	return sorted;
-
-    }
-	
-    public String encode(String str) {
-		  if (str == null)
-		   return "";
-
-		  StringBuffer sb = new StringBuffer();
-		  char[] data = str.toCharArray();
-		  char c, lastC = 0x0;
-		  for (char element : data) {
-		   c = element;
-		   if (c == '"') {
-		    sb.append("&quot;");
-		   } else if (c == '\'') {
-		    sb.append("&apos;");
-		   } else if (c == '<') {
-		    	sb.append("&lt;");
-		   } else if (c == '>') {
-			   sb.append("&gt;");
-		   }
-		   else if (c == '&') {
-		    sb.append("&amp;");
-		   } else if (c == '/' && lastC == '*') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&eCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else if (c == '*' && lastC == '/') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&bCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else {
-		    sb.append(c);
-		   }
-		   lastC = c;
-		  }
-		  return sb.toString();
-		 }
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/LegacyFilter.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/LegacyFilter.java
deleted file mode 100644
index f38bb4e..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/LegacyFilter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are 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 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactFilter;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-
-/**
- * This can be used to prevent the oss/j legacy artifacts from appearing
- *
- */
-
-public class LegacyFilter implements IArtifactFilter {
-
-	public boolean select(IAbstractArtifact artifact) {
-		
-		if (artifact.getPackage().startsWith("java")){
-			PluginLog.logDebug("Filtered  "+artifact.getName());
-			return false;
-		} else {
-			PluginLog.logDebug("Passed  "+artifact.getName());
-			return true;
-		}
-	}
-	
-	
-
-}
diff --git a/generators/tigerstripe-documentation/templates/cTypes.vm b/generators/tigerstripe-documentation/templates/cTypes.vm
deleted file mode 100644
index 70c5bca..0000000
--- a/generators/tigerstripe-documentation/templates/cTypes.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Complex Types</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Complex Types</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allDatatypes))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/enumerations.vm b/generators/tigerstripe-documentation/templates/enumerations.vm
deleted file mode 100644
index 02481bb..0000000
--- a/generators/tigerstripe-documentation/templates/enumerations.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Enumerations</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Enumerations</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($enum in ${docUtils.sortByName($castUtils.toModel($allEnumerations))} )
-#artiDetails($enum)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/exceptions.vm b/generators/tigerstripe-documentation/templates/exceptions.vm
deleted file mode 100644
index ac4f4fa..0000000
--- a/generators/tigerstripe-documentation/templates/exceptions.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Exceptions</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Exceptions</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allExceptions))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/index.vm b/generators/tigerstripe-documentation/templates/index.vm
deleted file mode 100644
index 8ab194b..0000000
--- a/generators/tigerstripe-documentation/templates/index.vm
+++ /dev/null
@@ -1,131 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html xmlns:xdt="http://www.w3.org/2005/02/xpath-datatypes" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>$tsProjectHandle.ProjectDetails.Name version: $tsProjectHandle.ProjectDetails.Version Documentation</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-<!-- 
- Generated by: $templateName in ${pluginConfig.pluginId} 
--->
-</head>
-<body>
-<h1>$tsProjectHandle.ProjectDetails.Name version: $tsProjectHandle.ProjectDetails.Version Documentation</h1>
-<dl>
-<dt>Project Description</dt>
-<dd>${tsProjectHandle.ProjectDetails.Description}</dd>
-</dl>
-<h2>Index</h2>
-<dl>
-<dt><a href="#sd">Service Definitions</a></dt>
-<dd>A list of the services available from ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="#p">Package List.</a></dt>
-<dd>A description of the segmentation of ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="#e">Entity Class List.</a></dt>
-<dd>A list of the entity classes in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="enumerations.html">Enumerations</a></dt>
-<dd>A list of the enumerations in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="cTypes.html">Complex Types</a></dt>
-<dd>A list of the complex types ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="updates.html">Update Procedures</a></dt>
-<dd>A list of the Update Procedures in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="notifications.html">Notifications</a></dt>
-<dd>A list of the Notifications in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="queries.html">Queries</a></dt>
-<dd>A list of the Queries in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="exceptions.html">Exceptions</a></dt>
-<dd>A list of the Exceptions in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-</dl>
-
-
-## Package hierarchy
-<h2><a name="p">Package List</a></h2>
-A description of the segmentation of ${tsProjectHandle.ProjectDetails.Name}.
-<ul>
-#foreach ($p in $docUtils.getRootPackages($managerSession, $allArtifacts))
-#package($p)
-#end
-</ul>
-## Class hierarchy
-<h2><a name="e">Entity Class List</a></h2>
-<p>A list of the entity classes in the ${tsProjectHandle.ProjectDetails.Name}. Entries in <i>italics</i> are abstract.</p>
-#foreach ($i in $docUtils.sortByName($castUtils.toModel($allEntities)))
-#href($i)#generals($i)<br/>
-#end
-
-<h2><a name="sd">Service Definitions</a></h2>
-A list of the services available from ${tsProjectHandle.ProjectDetails.Name}.
-<ul>
-#foreach ($s in $docUtils.sortByName($castUtils.toModel($allSessions)))
-<li>#href($s) #if(${s.inheritedOperations.size()}>0)has operations#end</li><ul>
-#foreach($o in $docUtils.sortByName(${s.inheritedOperations}))
-    <li>#href($o)</li>
-#end
-</ul>
-#set($ec=false)
-#foreach($e in $castUtils.toModel($allEntities))
-#foreach($i in $e.implements)
-#if($i == $s)
-#set($ec = true)
-#end
-#end
-#end
-#if($ec==true)
-Interface $s.name is implemented by:
-<ul>
-#foreach($e in $docUtils.sortByName($castUtils.toModel($allEntities)))
-#foreach($i in $e.implements)
-#if($i == $s)
-    <li>#href($e)#if(${e.inheritedOperations.size()}>0)has operations#end</li><ul>
-#foreach($o in $docUtils.sortByName($e.inheritedOperations))
-        <li>#href($o)</li>
-#end
-#end
-#end
-</ul>
-#end
-</ul>
-#end
-#if(${s.getArtifact().ManagedEntityDetails.size()}>0)
-Interface $s.name exposes:
-<ul>
-#foreach($e in ${s.getArtifact().ManagedEntityDetails})
-#foreach($a in $docUtils.sortByName($castUtils.toModel($allEntities)))
-#if($a.fullyQualifiedName.equals($e.fullyQualifiedName))
-    <li>#href($a)#if(${a.inheritedOperations.size()}>0)has operations#end</li><ul>
-#foreach($o in $a.inheritedOperations)
-        <li>#href($o)</li>
-#end
-</ul>
-#end
-#end
-#end
-</ul>
-#end
-
-#if(${s.getArtifact().EmittedEvents.size()}>0)
-Interface $s.name emits:
-<ul>
-#foreach($e in ${s.getArtifact().EmittedEvents})
-#foreach($a in $docUtils.sortByName($castUtils.toModel($allEvents)))
-#if($a.fullyQualifiedName.equals($e.fullyQualifiedName))
-    <li>#href($a)</li>
-#end
-#end
-#end
-</ul>
-#end
-
-#end
-</ul>
-<p/>
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/indexMacros.vm b/generators/tigerstripe-documentation/templates/indexMacros.vm
deleted file mode 100644
index 6fdeaba..0000000
--- a/generators/tigerstripe-documentation/templates/indexMacros.vm
+++ /dev/null
@@ -1,35 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#############################################
-## recurse package stucture
-#############################################
-#macro(package $p1)
-#if ($p1.hasElements())
-#set ($hash=${docUtils.getHash($p1.fullyQualifiedName)})
-<li><a href="pack${hash}.html">$p1.name</a></li>
-#else
-<li>$p1.name</li>
-#end
-#if ($p1.subPackages)
-<ul>
-#foreach($p2 in $p1.subPackages)
-#package($p2)
-#end
-</ul>
-#end
-#end
-#############################################
-## folllow generalization
-#############################################
-#macro(generals $e)
-#if($e.generalization)
-... #href($e.generalization)
-#generals($e.generalization)
-#end
-#end
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/notifications.vm b/generators/tigerstripe-documentation/templates/notifications.vm
deleted file mode 100644
index ecfcadd..0000000
--- a/generators/tigerstripe-documentation/templates/notifications.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Notifications</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Notifications</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allEvents))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/package.vm b/generators/tigerstripe-documentation/templates/package.vm
deleted file mode 100644
index eb85328..0000000
--- a/generators/tigerstripe-documentation/templates/package.vm
+++ /dev/null
@@ -1,195 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-##set ($hash=${docUtils.getHash($package.fullyQualifiedName)})
-##Now collect all the classes and associations in the package
-#set ($assocs = [])
-#set ($classes = [])
-#set ($intf = [])
-#set($dep = [])
-#set($dat = [])
-#set($exc = [])
-#set($enu = [])
-#set($que = [])
-#set($upd = [])
-#set($not = [])
-#set ($all = [] )
-#foreach($el in $package.getOwnedElements($allArtifacts))
-#if ( $el.association)
-#set ( $t = $assocs.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.managedEntity)
-#set ($t = $classes.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.Interface)
-#set ($t = $intf.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.dependency)
-#set ($t = $dep.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.dataType)
-#set ($t = $dat.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.exception)
-#set ($t = $exc.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.enumeration)
-#set ($t = $enu.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.query)
-#set ($t = $que.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.update)
-#set ($t = $upd.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.notification)
-#set ($t = $not.add($el))
-#set ( $t = $all.add($el))
-#end
-#end
-#if(!$all.empty)
-##set ( $generatedFile = "webdocs/pack${hash}.html")
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Package : $package.fullyQualifiedName</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Package: $package.fullyQualifiedName</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#if(!$package.subPackages.empty)
-<h2> Contained Packages</h2>
-<ul>
-#foreach($pack in $package.subPackages)
-<li>#phref($pack)</li>
-#end
-</ul>
-#end
-## And construct the summary
-## classes
-#if ($classes.size()>0)
-<h2>Classes</h2>
-<ul>
-#foreach($el in $classes )
-<li>#lhref($el)</li>
-#if (!$el.navigableConnectingEnds.empty)
-<ul>
-#foreach($e in $el.navigableConnectingEnds)
-<li>$e.name links to #href($e.type) by #href($e.association)</li>
-#end
-</ul>
-#end
-#end
-</ul>
-#end
-## associations
-#if ($assocs.size()>0)
-<h2>Associations</h2>
-<ul>
-#foreach($el in $assocs )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Interfaces
-#if ($intf.size()>0)
-<h2>Interfaces</h2>
-<ul>
-#foreach($el in $intf )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Dependencies
-#if ($dep.size()>0)
-<h2>Dependencies</h2>
-<ul>
-#foreach($el in $dep )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## dataType
-#if ($dat.size()>0)
-<h2>Complex Types</h2>
-<ul>
-#foreach($el in $dat )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Exceptions
-#if ($exc.size()>0)
-<h2>Exceptions</h2>
-<ul>
-#foreach($el in $exc )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Enumerations
-#if ($enu.size()>0)
-<h2>Enumerations</h2>
-<ul>
-#foreach($el in $enu )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Queries
-#if ($que.size()>0)
-<h2>Queries</h2>
-<ul>
-#foreach($el in $que )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Update Procedures
-#if ($upd.size()>0)
-<h2>Update procedures</h2>
-<ul>
-#foreach($el in $upd )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Notifications
-#if ($not.size()>0)
-<h2>Notifications</h2>
-<ul>
-#foreach($el in $not )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## details
-#if ($all.size()>0)
-<h2>Details</h3>
-#foreach($el in ${docUtils.sortByName($all)} )
-<p/>
-<table cellspacing="8" border="1" width="100%">
-#artiDetails($el)
-#end
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
-		#end
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/queries.vm b/generators/tigerstripe-documentation/templates/queries.vm
deleted file mode 100644
index afbc066..0000000
--- a/generators/tigerstripe-documentation/templates/queries.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Queries</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Queries</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allQueries))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/report.vm b/generators/tigerstripe-documentation/templates/report.vm
deleted file mode 100644
index cf90257..0000000
--- a/generators/tigerstripe-documentation/templates/report.vm
+++ /dev/null
@@ -1,351 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#####################################
-## construct a hyperlink for a package
-#####################################
-#macro(phref $p)
-#set ($do = false )
-#foreach($el in $p.ownedElements)
-#if ($el.association)
-#set ( $do = true)
-#end
-is it managedent $el.ManagedEntity
-#if($el.ManagedEntity)
-#set ( $do = true)
-#end
-#if($el.Interface)
-#set ( $do = true)
-#end
-#end
-#if ($do)
-#set ($hash=${docUtils.getHash($p.fullyQualifiedName)})
-<a href="pack${hash}.html">$p.name</a>
-#else
-$p.name
-#end
-#end
-#####################################
-## construct a hyperlink for an el
-#####################################
-#macro(href $el)
-#set($bm="$el.name")
-#if ($el.Method || $el.Field )
-#set($bm="${el.owner.name}_${el.name}")
-#end
-#set ($hash="${docUtils.getHash($el.package)}")
-#set ($pf = "pack${hash}.html")
-<a href="$pf#${bm}">
-#if($el.abstract)
-<i>$el.name</i>
-#else
-$el.name
-#end
-</a>
-#end
-#####################################
-## construct a local hyperlink for an el
-#####################################
-#macro(lhref $el)
-<a href="#${el.name}">
-#if($el.abstract)
-<i>$el.name</i>
-#else
-$el.name
-#end
-</a>
-#end
-#####################################
-## construct a bookmark for an el
-#####################################
-#macro(bookmark $el)
-<a name="${el.name}">
-#if($el.abstract)
-<i>$el.name</i>
-#else
-$el.name
-#end
-</a>
-#end
-#####################################
-## construct a bookmark for an op or an attr
-#####################################
-#macro(opAttrBookmark $op)
-<a name="${op.owner.name}_${op.name}">$op.name</a>
-#end
-#####################################
-## construct a bookmark for a blocking op 
-#####################################
-#macro(opBlockingBookmark $op)
-#set ($opName = $stringUtils.capitalize(${op.name}))
-<a name="${op.owner.name}_blocking${opName}">blocking${opName}</a>
-#end
-#####################################
-## dump stereotypes for element
-#####################################
-#macro (stereos $el)
-#foreach ( $s in $el.stereotypeInstances )
-$s.name
-#foreach ($at in $s.CharacterizingStereotype.Attributes)
-#if($at.Array)
-#set ($ts=$el.findTaggedValues($s.name))
-#if (!$ts.empty)
-:
-#set($comma="")
-#foreach($t in $ts)
-$comma $t
-#set ($comma=",")
-#end
-#end
-#else
-#set ($ts=$el.findTaggedValue($s.name))
-#if ($ts.length == 0)##
-#else
-: $ts
-#end
-#end
-#end
-<br/>
-#end
-#end
-#####################################
-## docs for an element
-#####################################
-#macro (docs $el)
-#if(!${stringUtils.isEmpty($el.getDocumentation("",64,false))})
-#set ($doc = $stringEscapeUtils.escapeXml($el.getDocumentation("",64,false)))
-<i>		$doc		</i>
-#end
-#end
-#####################################
-## spit out a type
-#####################################
-#macro (spitType $el)
-#set ($tp1 = $el.Type)
-#if(${tp1.isArtifact()})
-#if ($tp1.enum)
-<a href="enumerations.html#${tp1.name}">
-$tp1.name	</a>
-#elseif($tp1.Datatype)
-<a href="cTypes.html#${tp1.name}">
-$tp1.name	#if($el.isMany())	#end
-</a>
-#elseif($tp1.isEntityType())
-#set($e1= $tp1.getArtifact())
-#href($e1)
-#else
-	$tp1.name	#if($el.isMany())		#end
-	#end
-#else
-$tp1.name	#if($el.isMany())		#end
-#end
-#end
-#####################################
-## handle an operation return
-#####################################
-#macro (returnType $op)
-#set ($tp1 = $op.returnType)
-#if ($tp1.enumeration)
-<a href="enumerations.html#${tp1.name}">
-$tp1.name	#if($op.returnIsMany())	[]	#end
-</a>
-#elseif($tp1.Datatype)
-<a href="cTypes.html#${tp1.name}">
-$tp1.name	#if($op.returnIsMany())	[]	#end
-</a>
-#else
-	$tp1.name	#if($op.returnIsMany())	[]	#end
-#end
-#end
-#####################################
-## handle artifact details
-#####################################
-#macro (artiDetails $ct)
-<table cellspacing="8" border="1" width="100%">
-<tr class="ct">
-<td>
-<b>
-#bookmark($ct)
-</b>
-<br/>
-Type: $ct.artifactType
-<br/>
-Package: $ct.package
-#if ($ct.generalization)
-<br/>
-Superclass: #if($ct.generalization.project)#href($ct.generalization)#else$ct.generalization.fullyQualifiedName#end
-#end
-#if (!$ct.realizations.empty)
-<br/>
-Specializations:
-#set ($comma = "")
-#foreach ($c in $ct.realizations)
- $comma #href($c)
-#set ($comma = ",")
-#end
-#end
-#if($ct.query)
-#if($ct.returnedType)
-<br/>
-Return Type: $ct.returnedType
-#end
-#end
-</td>
-<td width="20%">#stereos($ct)</td>
-</tr>
-<tr>
-<td colspan="2">
-#docs($ct)
-</td>
-</tr>
-	
-	#if($ct.association)
-	#foreach($end in $ct.AssociationEnds)
-	<tr>
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	<b>Name: $end.Name</b>
-	Type: $end.Type.FullyQualifiedName, Visible: $end.VisibilityStr, Multiplicity: $end.DocMultiplicity, Aggregation: $end.EAggregation, Changeable: $end.changeable, Navigable: $end.Navigable, #if($end.many)Ordered: $end.ordered, Unique: $end.unique#end
-	<br/>
-	#docs($end)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($end)
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-	#end
-	
-	#if($ct.dependency)
-	<tr>
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	AEnd Artifact: $ct.AEndType
-	<br/>
-	ZEnd Artifact: $ct.ZEndType
-	<br/>
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-
-#if(!$ct.getAttributes(true).empty)
-		<tr>
-		<td bgcolor="Silver" colspan="2"><b>Attributes</b> (Local attributes on 
-		lavender background) </td>
-	</tr>
-	#foreach($att in $ct.getAttributes(true))
-	#if($att.owner.equals($ct))
-	<tr class="local">
-	#else
-	<tr class="nlocal">
-	#end
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	<b>$att.name:</b>
-	#spitType($att), $att.visibilityStr, Multiplicity: $att.multiplicity#if($att.isMany())#if($att.unique), unique#end#if($att.ordered), ordered#end	#end#if($att.readOnly), readOnly#end#if($att.DefaultValuePresent), Default value: $att.defaultValue#end
-	<br/>
-	#docs($att)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($att)
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-	#end
-	#if(!$ct.getLiterals(true).empty)
-		<tr>
-		<td bgcolor="Silver" colspan="2"><b>Literals</b> (Local literals on 
-		lavender background) </td>
-	</tr>
-	#foreach($lit in $ct.getLiterals(true))
-	#if($lit.owner.equals($ct))
-	<tr class="local">
-	#else
-	<tr class="nlocal">
-	#end
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	<b>$lit.name:</b>
-	$lit.visibilityStr, $lit.IextType.fullyQualifiedName, $docUtils.encode($lit.Value)
-	<br/>
-	#docs($lit)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($lit)
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-	#end
-	#if(!$ct.getOperations(true).empty)
-		<tr>
-		<td bgcolor="Silver" colspan="2"><b>Methods</b> (Local methods on 
-		lavender background) </td>
-	</tr>
-	#foreach($op in $ct.getOperations(true))
-	#if($op.owner.equals($ct))
-	<tr class="local">
-	#else
-	<tr class="nlocal">
-	#end
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	#if($op.abstract)<i>#end<b><a name="${ct.name}_${op.name}">$op.name:</a></b>
-	$op.visibilityStr $op.signature::#if($op.void)void#else$op.returnType.fullyQualifiedName $op.returnMultiplicity #if($op.returnMultiMany)#if($op.Unique) unique#end#if($op.Ordered) ordered#end#end#if($op.returnName.length() > 0) returnName: $op.returnName#end#if($op.defaultReturnValue.length() > 0) defaultReturnValue: $docUtils.encode($op.defaultReturnValue)#end#end
-	#if($op.abstract)</i>#end
-	<br/>
-	#docs($op)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($op)
-	</td></tr>
-	#if(!$op.arguments.empty)
-	<tr><td>
-	<b>Arguments</b></td>
-	</tr>
-	#foreach($arg in $op.parameters)
-	<tr><td>
-	<b>$arg.name</b>: $arg.type.name $arg.multiplicity#if($arg.many)#if($arg.ordered) ordered#end#if($arg.unique) unique#end#end $docUtils.encode($arg.defaultValue)
-	<br/>
-	#if($arg.comment.length() == 0)##
-	#else
-	<b>Description:</b> #docs($arg)
-	#end
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($arg)
-	#end
-	</td></tr>
-	#end
-	#if($op.exceptionsPresent)
-	</br>
-	<tr><td>
-	<b>Exceptions:</b> $op.exceptionList
-	</td></tr>
-	#end
-		</table>
-	</td>
-	</tr>
-	#end
-	#end
-</table>
-<p/>
-#end
-		
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/updates.vm b/generators/tigerstripe-documentation/templates/updates.vm
deleted file mode 100644
index 49b1f8a..0000000
--- a/generators/tigerstripe-documentation/templates/updates.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Update Procedures</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Update Procedures</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allUpdateProcedures))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/xref.vm b/generators/tigerstripe-documentation/templates/xref.vm
deleted file mode 100644
index 709cd62..0000000
--- a/generators/tigerstripe-documentation/templates/xref.vm
+++ /dev/null
@@ -1,36 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are 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 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<elementXref>
-#foreach( $el in $castUtils.toModel($allArtifacts))
-#set ($hash=${docUtils.getHash($el.package)})
-#set ($url= "pack${hash}.html#${el.name}")
-#if($el.ManagedEntity)
-#set($type="entity")
-#elseif($el.DataType)
-#set($type="complextype")
-#elseif($el.AssociationClass)
-#set($type="associationclass")
-#elseif($el.Association)
-#set($type="association")
-#elseif($el.Enumeration)
-#set($type="enumeration")
-#elseif($el.Interface)
-#set($type="interface")
-#else
-#set($type="error - type not known")
-#end
-<xref>
-  <type>$type</type>
-  <name>$el.name</name>
-  <fqn>$el.fullyQualifiedName</fqn>
-  <url>$url</url>
-</xref>
-#end
-</elementXref>
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/ts-plugin.xml b/generators/tigerstripe-documentation/ts-plugin.xml
deleted file mode 100644
index 228592c..0000000
--- a/generators/tigerstripe-documentation/ts-plugin.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts_plugin version="1.2">
-<project name="tigerstripe-documentation">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>3.3</version>
-<description>3.3 Second go at Bugzilla 239395&#13;
-3.2 Bugzilla 239395&#13;
-3.1 First open source version.&#13;
-3.0.2 Entity Services xml parsing&#13;
-3.0.1 Exception thrown on invalid directories (TSPLUG-40)&#13;
-3.0.1 Updated cisco-commons&#13;
-3.0  First Open source compatible version</description>
-<provider>Cisco Systems</provider>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="3" isEnabled="true" logPath="ts-documentation.log" maxRoll="9"/>
-<globalProperties>
-<property name="outputDir" tipToolText="" type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">tigerstripe-documentation</property>
-</globalProperties>
-<globalRules>
-<rule description="Creates the documentation index page." enabled="true" name="index" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/index.html" overwriteFiles="true" suppressFiles="true" template="templates/index.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="Creates a page documenting the models enumerationas and their literals." enabled="true" name="enumerations" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/enumerations.html" overwriteFiles="true" suppressFiles="true" template="templates/enumerations.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="complexTypes" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/cTypes.html" overwriteFiles="true" suppressFiles="true" template="templates/cTypes.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="xRef" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/xref.xml" overwriteFiles="true" suppressFiles="true" template="templates/xref.vm"/>
-</rule>
-<rule description="" enabled="true" name="copyStyles" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\styles.css" toDirectory="${ppProp.outputDir}/css"/>
-</rule>
-<rule description="" enabled="true" name="notifications" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/notifications.html" overwriteFiles="true" suppressFiles="true" template="templates/notifications.vm">
-<library name="templates\index.vm"/>
-<library name="templates\report.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="exceptions" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/exceptions.html" overwriteFiles="true" suppressFiles="true" template="templates\exceptions.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="updates" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/updates.html" overwriteFiles="true" suppressFiles="true" template="templates\updates.vm">
-<library name="templates\indexMacros.vm"/>
-<library name="templates\report.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="queries" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/queries.html" overwriteFiles="true" suppressFiles="true" template="templates\queries.vm">
-<library name="templates\indexMacros.vm"/>
-<library name="templates\report.vm"/>
-</body>
-</rule>
-</globalRules>
-<artifactRules>
-<rule description="" enabled="true" name="package" type="org.eclipse.tigerstripe.workbench.plugins.IArtifactBasedTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<body artifactFilterClass="" artifactType="Any Artifact" includeDependencies="true" modelClass="org.eclipse.tigerstripe.generators.models.PackageModel" modelClassName="package" outputFile="${ppProp.outputDir}/webdocs/pack${package.Hash}.html" overwriteFiles="false" suppressFiles="true" template="templates/package.vm">
-<library name="templates\report.vm"/>
-</body>
-</rule>
-</artifactRules>
-<classpathEntries>
-<entry relativePath="commons-lang-2.1.zip"/>
-</classpathEntries>
-<additionalFiles>
-<includeEntry relativePath="resources/"/>
-</additionalFiles>
-<advanced/>
-</ts_plugin>
diff --git a/misc/tigerstripe-maven-plugin/.classpath b/misc/tigerstripe-maven-plugin/.classpath
deleted file mode 100644
index 28cb53c..0000000
--- a/misc/tigerstripe-maven-plugin/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0.jar" sourcepath="M2_REPO/org/apache/maven/maven-plugin-api/2.0/maven-plugin-api-2.0-sources.jar"/>
-	<classpathentry kind="var" path="M2_REPO/org/codehaus/plexus/plexus-utils/1.4.9/plexus-utils-1.4.9.jar"/>
-	<classpathentry kind="var" path="M2_REPO/junit/junit/3.8.1/junit-3.8.1.jar" sourcepath="M2_REPO/junit/junit/3.8.1/junit-3.8.1-sources.jar"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/misc/tigerstripe-maven-plugin/.cvsignore b/misc/tigerstripe-maven-plugin/.cvsignore
deleted file mode 100644
index eb5a316..0000000
--- a/misc/tigerstripe-maven-plugin/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/misc/tigerstripe-maven-plugin/.project b/misc/tigerstripe-maven-plugin/.project
deleted file mode 100644
index 31cfdef..0000000
--- a/misc/tigerstripe-maven-plugin/.project
+++ /dev/null
@@ -1,13 +0,0 @@
-<projectDescription>
-  <name>eclipse-test-plugin</name>
-  <comment/>
-  <projects/>
-  <buildSpec>
-    <buildCommand>
-      <name>org.eclipse.jdt.core.javabuilder</name>
-    </buildCommand>
-  </buildSpec>
-  <natures>
-    <nature>org.eclipse.jdt.core.javanature</nature>
-  </natures>
-</projectDescription>
\ No newline at end of file
diff --git a/misc/tigerstripe-maven-plugin/pom.xml b/misc/tigerstripe-maven-plugin/pom.xml
deleted file mode 100644
index 191622a..0000000
--- a/misc/tigerstripe-maven-plugin/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<!--
-	Copyright (c) 2008 Cisco Systems, Inc.
-	All rights reserved. This program and the accompanying materials
-	are 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
-	
-	Contributors:
-	Cisco Systems, Inc. - Initial version
--->
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>tigerstripe</groupId>
-	<artifactId>maven-tigerstripe-plugin</artifactId>
-	<packaging>maven-plugin</packaging>
-	<version>1.3</version>
-	<name>Tigerstripe Maven Plug-in</name>
-	<dependencies>
-		<dependency>
-			<groupId>org.apache.maven</groupId>
-			<artifactId>maven-plugin-api</artifactId>
-			<version>2.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.codehaus.plexus</groupId>
-			<artifactId>plexus-utils</artifactId>
-			<version>1.4.9</version>
-		</dependency>
-		<dependency>
-			<groupId>junit</groupId>
-			<artifactId>junit</artifactId>
-			<version>3.8.1</version>
-			<scope>test</scope>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin> 	
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-compiler-plugin</artifactId>
-				<configuration>
-					<source>1.5</source>
-					<target>1.5</target>
-				</configuration>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/misc/tigerstripe-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/GenerateMojo.java b/misc/tigerstripe-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/GenerateMojo.java
deleted file mode 100644
index fb73d75..0000000
--- a/misc/tigerstripe-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/GenerateMojo.java
+++ /dev/null
@@ -1,118 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.mojo;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import org.apache.maven.plugin.AbstractMojo;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.MojoFailureException;
-import org.codehaus.plexus.util.cli.CommandLineUtils;
-import org.codehaus.plexus.util.cli.Commandline;
-import org.codehaus.plexus.util.cli.StreamConsumer;
-
-/**
- * @goal generate
- * @phase generate-sources
- */
-public class GenerateMojo extends AbstractMojo {
-
-	private static final String DELIMITER = "=";
-	
-	private static final String IMPORT_PROJECT_ARG = "PROJECT_IMPORT";
-
-	private static final String GENERATION_PROJECT_ARG = "GENERATION_PROJECT";
-	
-	protected static final String WIN_ECLIPSE_EXE = "eclipsec.exe";
-	
-	protected static final String MAC_ECLIPSE_EXE = "eclipse";
-	
-	protected static final String LNX_ECLIPSE_EXE = MAC_ECLIPSE_EXE;
-	
-	/**
-	 * @parameter expression="${workspace}"
-	 * @required
-	 */
-	public String workspace;
-
-	/**
-	 * @parameter expression="${ECLIPSE_HOME}"
-	 * @required
-	 */
-	public String eclipseHome;
-
-	/**
-	 * @parameter expression="${projects}"
-	 * @required
-	 */
-	public ArrayList<String> projects;
-	
-	/**
-	 * @parameter expression="${generationProject}"
-	 * @required
-	 */
-	public String generationProject;
-	
-	public void execute() throws MojoExecutionException {
-		
-		
-		
-		getLog().debug("Workspace: " + workspace);
-		for (String project : projects) {
-			getLog().info("Projects: " + project);
-		}
-		getLog().debug("Eclipse home: " + eclipseHome);
-		
-		Commandline cl = new Commandline();
-		cl.setExecutable(eclipseHome + File.separator + getExecutableForOs(System.getProperty("os.name")));
-		cl.createArg(true).setValue("-nosplash");
-		cl.createArg().setValue("-data");
-		cl.createArg().setValue(workspace);
-		cl.createArg().setValue("-application");
-		cl.createArg().setValue("org.eclipse.tigerstripe.workbench.headless.tigerstripe");
-		
-		// add plug-in parameters as key/value pairs
-		for (String project : projects) {
-			cl.createArg().setValue(IMPORT_PROJECT_ARG + DELIMITER + project);
-		}
-		cl.createArg().setValue(GENERATION_PROJECT_ARG + DELIMITER + generationProject);
-		
-		StreamConsumer consumer = new StreamConsumer() {
-			public void consumeLine(String line) {
-				getLog().info(line);
-			}
-		};
-
-		try {
-			int result = CommandLineUtils.executeCommandLine(cl, consumer, consumer);
-			if(result != 0) {
-				throw new MojoFailureException("Tigerstripe generation failed. See logs for more information.");
-			}
-		} catch (Exception e) {
-			throw new MojoExecutionException("Command execution failed.", e);
-		}
-	}
-
-	protected String getExecutableForOs(String osName) {
-		
-		if(osName.startsWith("Mac OS")) {
-			return MAC_ECLIPSE_EXE;
-		}
-		else if (osName.startsWith("Linux")) {
-			return LNX_ECLIPSE_EXE;
-		}
-		else if (osName.startsWith("Windows")) {
-			return WIN_ECLIPSE_EXE;
-		}
-		throw new UnsupportedOperationException(osName + "is not currently supported.");
-	}
-}
diff --git a/misc/tigerstripe-maven-plugin/src/test/java/org/eclipse/tigerstripe/mojo/GenerateMojoTest.java b/misc/tigerstripe-maven-plugin/src/test/java/org/eclipse/tigerstripe/mojo/GenerateMojoTest.java
deleted file mode 100644
index e734c05..0000000
--- a/misc/tigerstripe-maven-plugin/src/test/java/org/eclipse/tigerstripe/mojo/GenerateMojoTest.java
+++ /dev/null
@@ -1,45 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.mojo;
-
-import junit.framework.TestCase;
-
-import org.eclipse.tigerstripe.mojo.GenerateMojo;
-
-public class GenerateMojoTest extends TestCase {
-
-	public void testGetExecutableForOs() {
-		
-		GenerateMojo mojo = new GenerateMojo();
-		
-		try {
-			mojo.getExecutableForOs("unsupported os");
-			fail("Expected UnsupportedOperationException");
-		} catch (UnsupportedOperationException uoe) {
-			// pass
-		}
-		
-		assertEquals(GenerateMojo.MAC_ECLIPSE_EXE, mojo.getExecutableForOs("Mac OS"));
-		assertEquals(GenerateMojo.WIN_ECLIPSE_EXE, mojo.getExecutableForOs("Windows XP"));
-		assertEquals(GenerateMojo.WIN_ECLIPSE_EXE, mojo.getExecutableForOs("Windows 2003"));
-		assertEquals(GenerateMojo.LNX_ECLIPSE_EXE, mojo.getExecutableForOs("Linux"));
-		
-		// Test based on build environment (Linux is excluded as I don't have a Linux box to test on)
-		if(System.getProperty("os.name").startsWith("Mac OS")) {
-			assertEquals(GenerateMojo.MAC_ECLIPSE_EXE, mojo.getExecutableForOs(System.getProperty("os.name")));
-		}
-		else if (System.getProperty("os.name").startsWith("Windows")) {
-			assertEquals(GenerateMojo.WIN_ECLIPSE_EXE, mojo.getExecutableForOs(System.getProperty("os.name")));
-		}
-	
-	}
-	
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/.classpath b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/.classpath
deleted file mode 100644
index 1fa3e68..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/.project b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/.project
deleted file mode 100644
index 74cb5d1..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<projectDescription>

-	<name>org.eclipse.tigerstripe.annotation.resource.ui.refactoring</name>

-	<comment></comment>

-	<projects>

-	</projects>

-	<buildSpec>

-		<buildCommand>

-			<name>org.eclipse.jdt.core.javabuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.ManifestBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-		<buildCommand>

-			<name>org.eclipse.pde.SchemaBuilder</name>

-			<arguments>

-			</arguments>

-		</buildCommand>

-	</buildSpec>

-	<natures>

-		<nature>org.eclipse.pde.PluginNature</nature>

-		<nature>org.eclipse.jdt.core.javanature</nature>

-	</natures>

-</projectDescription>

diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/META-INF/MANIFEST.MF
deleted file mode 100644
index 1788927..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tigerstripe Annotation Resource Refactoring Plug-in
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotation.resource.ui.refactoring;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.core.resources,
- org.eclipse.ltk.core.refactoring,
- org.eclipse.tigerstripe.annotation.resource,
- org.eclipse.emf.ecore,
- org.eclipse.jface,
- org.eclipse.ui.workbench,
- org.eclipse.ui.ide,
- org.eclipse.tigerstripe.annotation.core
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/build.properties b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/build.properties
deleted file mode 100644
index 2c6c609..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/build.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-###############################################################################

-# Copyright (c) 2008 xored software, Inc.  

-# 

-# All rights reserved. This program and the accompanying materials 

-# are 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  

-# 

-# Contributors: 

-#     xored software, Inc. - initial API and Implementation (Yuri Strot) 

-###############################################################################

-source.. = src/

-output.. = bin/

-bin.includes = META-INF/,\

-               .,\

-               plugin.xml

diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/plugin.xml b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/plugin.xml
deleted file mode 100644
index 8a66859..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-	<extension
-			point="org.eclipse.tigerstripe.annotation.core.refactoringSupport">
-		<refactoringSupport
-			id="org.eclipse.tigerstripe.annotation.resource.refactoring"
-			class="org.eclipse.tigerstripe.annotation.resource.ui.refactoring.ResourceRefactoringSupport"/>
-	</extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/src/org/eclipse/tigerstripe/annotation/resource/ui/refactoring/RefactoringUtil.java b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/src/org/eclipse/tigerstripe/annotation/resource/ui/refactoring/RefactoringUtil.java
deleted file mode 100644
index f7642a4..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/src/org/eclipse/tigerstripe/annotation/resource/ui/refactoring/RefactoringUtil.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/******************************************************************************* 

- * Copyright (c) 2008 xored software, Inc.  

- * 

- * All rights reserved. This program and the accompanying materials 

- * are 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  

- * 

- * Contributors: 

- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 

- *******************************************************************************/

-package org.eclipse.tigerstripe.annotation.resource.ui.refactoring;

-

-import java.util.ArrayList;

-import java.util.List;

-

-import org.eclipse.core.resources.IResource;

-import org.eclipse.core.resources.IWorkspaceRoot;

-import org.eclipse.core.resources.ResourcesPlugin;

-import org.eclipse.core.runtime.IPath;

-import org.eclipse.ltk.core.refactoring.resource.MoveResourcesDescriptor;

-import org.eclipse.ltk.core.refactoring.resource.RenameResourceDescriptor;

-

-/**

- * @author Yuri Strot

- *

- */

-public class RefactoringUtil {

-	

-	public static IResource getDestination(MoveResourcesDescriptor des) {

-		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();

-		IPath destination = des.getDestinationPath();

-		return root.findMember(destination);

-	}

-	

-	public static IResource[] getResources(MoveResourcesDescriptor des) {

-		List<IResource> resources = new ArrayList<IResource>();

-		final IWorkspaceRoot root= ResourcesPlugin.getWorkspace().getRoot();

-		IPath[] paths = des.getResourcePathsToMove();

-		for (int i = 0; i < paths.length; i++) {

-			IResource res = root.findMember(paths[i]);

-			if (res != null)

-				resources.add(res);

-		}

-		

-		return resources.toArray(new IResource[resources.size()]);

-	}

-	

-	public static IResource getResource(RenameResourceDescriptor rrd) {

-		final IWorkspaceRoot root = ResourcesPlugin.getWorkspace().getRoot();

-		IPath path = rrd.getResourcePath();

-		return root.findMember(path);

-	}

-	

-	public static IPath getNewPath(IResource resource, RenameResourceDescriptor rrd) {

-		String name = rrd.getNewName();

-		if (resource != null) {

-			IPath path1 = resource.getFullPath();

-			IPath path2 = path1.removeLastSegments(1).append(name);

-			return path2;

-		}

-		return null;

-	}

-}
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/src/org/eclipse/tigerstripe/annotation/resource/ui/refactoring/ResourceRefactoringSupport.java b/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/src/org/eclipse/tigerstripe/annotation/resource/ui/refactoring/ResourceRefactoringSupport.java
deleted file mode 100644
index 1319d0e..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.resource.ui.refactoring/src/org/eclipse/tigerstripe/annotation/resource/ui/refactoring/ResourceRefactoringSupport.java
+++ /dev/null
@@ -1,127 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.resource.ui.refactoring;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IContainer;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IPath;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.ltk.core.refactoring.RefactoringCore;
-import org.eclipse.ltk.core.refactoring.RefactoringDescriptor;
-import org.eclipse.ltk.core.refactoring.history.IRefactoringExecutionListener;
-import org.eclipse.ltk.core.refactoring.history.RefactoringExecutionEvent;
-import org.eclipse.ltk.core.refactoring.resource.MoveResourcesDescriptor;
-import org.eclipse.ltk.core.refactoring.resource.RenameResourceDescriptor;
-import org.eclipse.tigerstripe.annotation.resource.ResourceURIConverter;
-import org.eclipse.tigerstripe.annotation.core.RefactoringSupport;
-
-/**
- * @author Yuri Strot
- *
- */
-public class ResourceRefactoringSupport extends RefactoringSupport {
-	
-	private IResource resource;
-	private IResource[] resources;
-	
-	public ResourceRefactoringSupport() {
-		addListeners();
-	}
-
-	protected void addListeners() {
-		RefactoringCore.getHistoryService().addExecutionListener(new IRefactoringExecutionListener() {
-
-			public void executionNotification(RefactoringExecutionEvent event) {
-				RefactoringDescriptor des = event.getDescriptor().requestDescriptor(new NullProgressMonitor());
-				if (des instanceof RenameResourceDescriptor) {
-					processRename((RenameResourceDescriptor)des, event.getEventType());
-				}
-				if (des instanceof MoveResourcesDescriptor) {
-					processMove((MoveResourcesDescriptor)des, event.getEventType());
-				}
-			}
-		
-		});
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(new IResourceChangeListener() {
-			
-			public void resourceChanged(IResourceChangeEvent event) {
-				fireContainerUpdated();
-			}
-		
-		});
-		
-	}
-	
-	public void processRename(RenameResourceDescriptor rrd, int eventType) {
-		if (eventType == RefactoringExecutionEvent.ABOUT_TO_PERFORM) {
-			resource = RefactoringUtil.getResource(rrd);
-		}
-		else if (eventType == RefactoringExecutionEvent.PERFORMED && resource != null){
-			IPath newPath = RefactoringUtil.getNewPath(resource, rrd);
-			if (newPath != null) {
-				Map<URI, URI> changes = new HashMap<URI, URI>();
-				IResource newResource = ResourcesPlugin.getWorkspace().getRoot().findMember(newPath);
-				collectChanges(newResource, resource.getFullPath(), changes);
-				fireRefactoringPerformed(changes);
-			}
-			resource = null;
-		}
-	}
-	
-	public void processMove(MoveResourcesDescriptor des, int eventType) {
-		if (eventType == RefactoringExecutionEvent.ABOUT_TO_PERFORM) {
-			resources = RefactoringUtil.getResources(des);
-		}
-		else if (eventType == RefactoringExecutionEvent.PERFORMED && resources != null){
-			IResource destination = RefactoringUtil.getDestination(des);
-			if (destination != null) {
-				Map<URI, URI> changes = new HashMap<URI, URI>();
-				for (int i = 0; i < resources.length; i++) {
-					IPath oldPath = resources[i].getFullPath();
-					IPath newPath = destination.getFullPath().append(oldPath.lastSegment());
-					IResource newResource = ResourcesPlugin.getWorkspace().getRoot().findMember(newPath);
-					collectChanges(newResource, oldPath, changes);
-                }
-				fireRefactoringPerformed(changes);
-			}
-			resources = null;
-		}
-	}
-	
-	protected static void collectChanges(IResource resource, IPath oldPath, Map<URI, URI> changes) {
-		changes.put(ResourceURIConverter.toURI(oldPath), ResourceURIConverter.toURI(resource));
-		if (resource instanceof IContainer) {
-			IContainer container = (IContainer)resource;
-			try {
-				//TODO how we going on to work with phantom and team private resources?
-	            IResource[] members = container.members(0);
-	            for (int i = 0; i < members.length; i++) {
-	            	IResource child = members[i];
-	            	IPath childOldPath = oldPath.append(child.getFullPath().lastSegment());
-	            	collectChanges(child, childOldPath, changes);
-                }
-            }
-            catch (CoreException e) {
-	            e.printStackTrace();
-            }
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/.classpath b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/.classpath
deleted file mode 100644
index cf54b4b..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src" />
-	<classpathentry kind="con"
-		path="org.eclipse.jdt.launching.JRE_CONTAINER" />
-	<classpathentry kind="con"
-		path="org.eclipse.pde.core.requiredPlugins" />
-	<classpathentry kind="output" path="bin" />
-</classpath>
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/.project b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/.project
deleted file mode 100644
index 96ed76b..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotation.ui.example.customView</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.api.tools.apiAnalysisBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.api.tools.apiAnalysisNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/META-INF/MANIFEST.MF
deleted file mode 100644
index 8425aef..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,13 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Custom View Example Plug-in
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotation.ui.example.customView;singleton:=true
-Bundle-Version: 0.4.6.qualifier
-Bundle-Activator: org.eclipse.tigerstripe.annotation.ui.example.customview.CustomViewPlugin
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tigerstripe.annotation.core,
- org.eclipse.tigerstripe.annotation.ui,
- org.eclipse.ui.views.properties.tabbed
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/build.properties b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/model/styles.ecore b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/model/styles.ecore
deleted file mode 100644
index 1077504..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/model/styles.ecore
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<ecore:EPackage xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="styles"

-    nsURI="http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore"

-    nsPrefix="org.eclipse.tigerstripe.annotation.ui.example.customview.styles">

-  <eClassifiers xsi:type="ecore:EClass" name="Color">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="red" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="green" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="blue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-  </eClassifiers>

-  <eClassifiers xsi:type="ecore:EClass" name="Font">

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="height" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>

-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="style" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>

-  </eClassifiers>

-</ecore:EPackage>

diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/model/styles.genmodel b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/model/styles.genmodel
deleted file mode 100644
index ead42b8..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/model/styles.genmodel
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<genmodel:GenModel xmi:version="2.0"

-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"

-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.tigerstripe.annotation.ui.example.customView/src"

-    modelPluginID="org.eclipse.tigerstripe.annotation.ui.example.customView" modelName="Styles"

-    importerID="org.eclipse.emf.importer.java" complianceLevel="5.0" copyrightFields="false">

-  <foreignModel>@model</foreignModel>

-  <genPackages prefix="Styles" basePackage="org.eclipse.tigerstripe.annotation.ui.example.customview"

-      disposableProviderFactory="true" ecorePackage="styles.ecore#/">

-    <genClasses ecoreClass="styles.ecore#//Color">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute styles.ecore#//Color/red"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute styles.ecore#//Color/green"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute styles.ecore#//Color/blue"/>

-    </genClasses>

-    <genClasses ecoreClass="styles.ecore#//Font">

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute styles.ecore#//Font/height"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute styles.ecore#//Font/name"/>

-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute styles.ecore#//Font/style"/>

-    </genClasses>

-  </genPackages>

-</genmodel:GenModel>

diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/plugin.xml b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/plugin.xml
deleted file mode 100644
index eed2696..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/plugin.xml
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
- 
-	<extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-		<propertySections contributorId="org.eclipse.tigerstripe.annotation.ui.properties">
-			<propertySection
-				class="org.eclipse.tigerstripe.annotation.ui.example.customview.FontSection"
-				filter="org.eclipse.tigerstripe.annotation.ui.example.customview.FontAnnotationFilter"
-				id="property.section.AnnotationFontSection"
-				tab="property.tab.PropertiesPropertySection">
-			</propertySection>
-		</propertySections>
-	</extension>
- 
-	<extension 
-    		point="org.eclipse.ui.views.properties.tabbed.propertyTabs">
-		<propertyTabs 
-				contributorId="org.eclipse.tigerstripe.annotation.ui.properties">   
-			<propertyTab
-				category="Properties"
-				id="property.tab.AnnotationColor"
-				label="Color"/>
-		</propertyTabs>
-	</extension>
- 
-	<extension point="org.eclipse.ui.views.properties.tabbed.propertySections">
-		<propertySections contributorId="org.eclipse.tigerstripe.annotation.ui.properties">
-			<propertySection
-				class="org.eclipse.tigerstripe.annotation.ui.example.customview.ColorSection"
-				filter="org.eclipse.tigerstripe.annotation.ui.example.customview.ColorAnnotationFilter"
-				id="property.section.AnnotationColorSection"
-				tab="property.tab.AnnotationColor">
-			</propertySection>
-		</propertySections>
-	</extension>
-
-	<extension point="org.eclipse.emf.ecore.generated_package">
-		<package 
-			uri = "http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore" 
-			class = "org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage"
-			genModel = "model/styles.genmodel" /> 
-	</extension>
-  
-	<extension point="org.eclipse.tigerstripe.annotation.core.annotationType">
-		<definition
-			name="Color"
-			epackage-uri="http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore"
-			description="Color"
-			eclass="Color"/>
-	</extension>
-  
-	<extension point="org.eclipse.tigerstripe.annotation.core.annotationType">
-		<definition
-			name="Font"
-			epackage-uri="http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore"
-			description="Font"
-			eclass="Font"/>
-	</extension>
-	
-	<extension
-			point="org.eclipse.tigerstripe.annotation.core.packageLabel">
-		<label
-			epackage-uri="http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore"
-			name="Styles"/>
-	</extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/ColorAnnotationFilter.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/ColorAnnotationFilter.java
deleted file mode 100644
index 301e220..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/ColorAnnotationFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.tigerstripe.annotation.core.Annotation;
-import org.eclipse.tigerstripe.annotation.ui.core.properties.AnnotationFilter;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage;
-
-/**
- * @author Yuri Strot
- *
- */
-public class ColorAnnotationFilter extends AnnotationFilter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tigerstripe.annotation.ui.core.properties.AnnotationFilter#select(org.eclipse.tigerstripe.annotation.core.Annotation)
-	 */
-	@Override
-	public boolean select(Annotation annotation) {
-		EObject content = annotation.getContent();
-		if (content != null && content.eClass().equals(StylesPackage.eINSTANCE.getColor()))
-			return true;
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/ColorSection.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/ColorSection.java
deleted file mode 100644
index d5c420f..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/ColorSection.java
+++ /dev/null
@@ -1,161 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview;
-
-import org.eclipse.emf.ecore.EStructuralFeature;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.swt.widgets.Slider;
-import org.eclipse.swt.widgets.Spinner;
-import org.eclipse.tigerstripe.annotation.core.Annotation;
-import org.eclipse.tigerstripe.annotation.ui.core.properties.AnnotationPropertiesSection;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-/**
- * @author Yuri Strot
- *
- */
-public class ColorSection extends AnnotationPropertiesSection {
-	
-	private Composite right;
-	private EditorBunch red;
-	private EditorBunch green;
-	private EditorBunch blue;
-	
-	private Annotation annotation;
-	
-	private class EditorBunch {
-		
-		private Slider slider;
-		private Spinner spinner;
-		private String feature;
-		
-		public EditorBunch(Slider slider, Spinner spinner, String feature) {
-			this.slider = slider;
-			this.spinner = spinner;
-			this.feature = feature;
-			init();
-		}
-		
-		public void setSelection(int selection) {
-			if (slider.getSelection() != selection)
-				slider.setSelection(selection);
-			if (spinner.getSelection() != selection)
-				spinner.setSelection(selection);
-		}
-		
-		public int getSelection() {
-			return spinner.getSelection();
-		}
-		
-		private void init() {
-			slider.addSelectionListener(new SelectionListener() {
-				
-				public void widgetSelected(SelectionEvent e) {
-					int value = slider.getSelection();
-					if (spinner.getSelection() != value)
-						spinner.setSelection(value);
-					updateColor(feature, value);
-					updateColor();
-				}
-			
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-			});
-			slider.setMinimum(0);
-			slider.setMaximum(255);
-			spinner.addModifyListener(new ModifyListener() {
-			
-				public void modifyText(ModifyEvent e) {
-					int value = spinner.getSelection();
-					if (value != slider.getSelection())
-						slider.setSelection(value);
-					updateColor(feature, value);
-					updateColor();
-				}
-			});
-			spinner.setMinimum(0);
-			spinner.setMaximum(255);
-		}
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	@Override
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		parent.setLayout(new GridLayout());
-		TabbedPropertySheetWidgetFactory factory = tabbedPropertySheetPage.getWidgetFactory();
-		Group group = factory.createGroup(parent, "Color");
-		group.setLayout(new GridLayout(2, false));
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
-		Composite left = factory.createComposite(group);
-		left.setLayout(new GridLayout(3, false));
-		red = getColorSpinner(left, factory, "red");
-		green = getColorSpinner(left, factory, "green");
-		blue = getColorSpinner(left, factory, "blue");
-		right = factory.createComposite(group, SWT.BORDER);
-		updateColor();
-	}
-	
-	protected EditorBunch getColorSpinner(Composite parent, TabbedPropertySheetWidgetFactory factory,
-			final String feature) {
-		factory.createLabel(parent, feature.substring(0, 1).toUpperCase() + feature.substring(1));
-		return new EditorBunch(new Slider(parent, SWT.NONE),
-				new Spinner(parent, SWT.BORDER), feature);
-	}
-	
-	private void updateColor() {
-		Color color = new Color(right.getDisplay(), red.getSelection(),
-				green.getSelection(), blue.getSelection());
-		right.setBackground(color);
-	}
-	
-	private void updateColor(String feature, int value) {
-		EStructuralFeature efeature = annotation.getContent(
-				).eClass().getEStructuralFeature(feature);
-		Object oldValue = annotation.getContent().eGet(efeature);
-		Object newValue = new Integer(value);
-		if (oldValue == null || !oldValue.equals(newValue))
-			annotation.getContent().eSet(efeature, newValue);
-	}
-	
-	private void updateColor(Annotation annotation) {
-		if (right != null && !right.isDisposed()) {
-			org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color color = 
-				(org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color)annotation.getContent();
-			if (color != null) {
-				red.setSelection(color.getRed());
-				green.setSelection(color.getGreen());
-				blue.setSelection(color.getBlue());
-				updateColor();
-			}
-		}
-	}
-	
-	protected void updateSection(Annotation annotation) {
-		this.annotation = annotation;
-		updateColor(annotation);
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/CustomViewPlugin.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/CustomViewPlugin.java
deleted file mode 100644
index 66d0ef6..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/CustomViewPlugin.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.tigerstripe.annotation.ui.example.customview;
-
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class CustomViewPlugin extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tigerstripe.annotation.ui.example.customView";
-
-	// The shared instance
-	private static CustomViewPlugin plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public CustomViewPlugin() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static CustomViewPlugin getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontAnnotationFilter.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontAnnotationFilter.java
deleted file mode 100644
index 1a31267..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontAnnotationFilter.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.tigerstripe.annotation.core.Annotation;
-import org.eclipse.tigerstripe.annotation.ui.core.properties.AnnotationFilter;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage;
-
-/**
- * @author Yuri Strot
- *
- */
-public class FontAnnotationFilter extends AnnotationFilter {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tigerstripe.annotation.ui.core.properties.AnnotationFilter#select(org.eclipse.tigerstripe.annotation.core.Annotation)
-	 */
-	@Override
-	public boolean select(Annotation annotation) {
-		EObject content = annotation.getContent();
-		if (content != null && content.eClass().equals(StylesPackage.eINSTANCE.getFont()))
-			return true;
-		return false;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontHelper.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontHelper.java
deleted file mode 100644
index d8d996b..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontHelper.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/******************************************************************************
- * Copyright (c) 2004 IBM Corporation and others.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    IBM Corporation - initial API and implementation 
- *    xored software, Inc. - initial API and Implementation (Yuri Strot) 
- ****************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview;
-
-import java.util.Arrays;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.widgets.Display;
-
-/**
- * @author Yuri Strot
- *
- */
-public class FontHelper {
-	
-	private static String[] FONT_NAMES;
-	
-	/**
-	 * array of font sizes
-	 */
-	protected static final String[] FONT_SIZES = { "8", //$NON-NLS-1$
-		"9", //$NON-NLS-1$
-		"10", //$NON-NLS-1$
-		"11", //$NON-NLS-1$
-		"12", //$NON-NLS-1$
-		"14", //$NON-NLS-1$
-		"16", //$NON-NLS-1$
-		"18", //$NON-NLS-1$
-		"20", //$NON-NLS-1$
-		"22", //$NON-NLS-1$
-		"24", //$NON-NLS-1$
-		"26", //$NON-NLS-1$
-		"28", //$NON-NLS-1$
-		"36", //$NON-NLS-1$
-		"48", //$NON-NLS-1$
-		"72" }; //$NON-NLS-1$
-	
-	/**
-	 * Return the font names for the default display.
-	 *  
-	 * @return String array of font names as String objects for the default
-	 * display. 
-	 */
-	static public String[] getFontNames() {
-		if (FONT_NAMES != null)
-			return FONT_NAMES;
-		
-		//add the names into a set to get a set of unique names
-		Set<String> stringItems = new HashSet<String>();
-		FontData[] fontDatas = Display.getDefault().getFontList(null, true);
-		for (int i = 0; i < fontDatas.length; i++) {
-			if (fontDatas[i].getName() != null) {
-				stringItems.add(fontDatas[i].getName());
-			}
-		}
-		
-		//add strings into the array
-		String strings[] = new String[stringItems.size()];
-		int i = 0;
-		for (String string : stringItems) {
-			strings[i++] = string;
-		}
-		
-		//sort the array
-		Arrays.sort(strings);
-
-		return FONT_NAMES = strings;
-	}
-	
-	/**
-	 * @return - array of fomt sizes
-	 */
-	public static final String[] getFontSizes(){
-		return FONT_SIZES;
-	}
-	
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontSection.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontSection.java
deleted file mode 100644
index 3b5731b..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/FontSection.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.jface.resource.JFaceResources;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.CCombo;
-import org.eclipse.swt.custom.CLabel;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.FontData;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Group;
-import org.eclipse.tigerstripe.annotation.core.Annotation;
-import org.eclipse.tigerstripe.annotation.ui.core.properties.AnnotationPropertiesSection;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage;
-import org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetWidgetFactory;
-
-/**
- * @author Yuri Strot
- *
- */
-public class FontSection extends AnnotationPropertiesSection {
-	
-	private static final String BOLD = "Bold";
-	private static final String ITALIC = "Italic";
-	private static final String NORMAL = "Normal";
-	
-	private FontProperty nameProperty;
-	private FontProperty heightProperty;
-	private FontProperty styleProperty;
-	
-	private Annotation annotation;
-	private CLabel preview;
-	private FontData data;
-	
-	private class FontProperty {
-		
-		private static final int NAME = 1;
-		private static final int HEIGHT = 2;
-		private static final int STYLE = 3;
-		
-		private int property;
-		private CCombo propertyCombo;
-		
-		public FontProperty(int property) {
-			this.property = property;
-		}
-		
-		private EAttribute getFeature() {
-			switch (property) {
-				case STYLE:
-					return StylesPackage.eINSTANCE.getFont_Style();
-				case HEIGHT:
-					return StylesPackage.eINSTANCE.getFont_Height();
-				default:
-					return StylesPackage.eINSTANCE.getFont_Name();
-			}
-		}
-		
-		private String getDefault() {
-			Font defaultFont = JFaceResources.getDefaultFont();
-			FontData defaultData = defaultFont.getFontData()[0];
-			switch (property) {
-				case STYLE:
-					return getOppositeValue(defaultData.getStyle());
-				case HEIGHT:
-					return getOppositeValue(defaultData.getHeight());
-				default:
-					return defaultData.getName();
-			}
-			
-		}
-		
-		private String getOppositeValue(int value) {
-			switch (property) {
-				case STYLE:
-					if (value == SWT.BOLD)
-						return BOLD;
-					if (value == SWT.ITALIC)
-						return ITALIC;
-					return NORMAL;
-				default:
-					return value + "";
-			}
-		}
-		
-		private int getValue(String value) {
-			switch (property) {
-				case STYLE:
-					if (value.equals(BOLD))
-						return SWT.BOLD;
-					if (value.equals(ITALIC))
-						return SWT.ITALIC;
-					return SWT.NORMAL;
-				default:
-					return Integer.parseInt(value);
-			}
-		}
-		
-		public void update() {
-			EAttribute attr = getFeature();
-			if (annotation.getContent() == null)
-				return;
-			Object value = annotation.getContent().eGet(attr);
-			String text;
-			if ((value == null && attr.getDefaultValue() == null) ||
-					(value != null && attr.getDefaultValue() != null &&
-							value.equals(attr.getDefaultValue()))) {
-				text = getDefault();
-			}
-			else {
-				if (property == STYLE)
-					text = getOppositeValue( ((Integer)value).intValue() );
-				else
-					text = value.toString();
-			}
-			setPreview(text);
-			propertyCombo.setText(text);
-		}
-		
-		private void setPreview(String value) {
-			switch (property) {
-				case NAME:
-					data.setName(value);
-					break;
-				case HEIGHT:
-					data.setHeight(getValue(value));
-					break;
-				case STYLE:
-					data.setStyle(getValue(value));
-					break;
-			}
-			Font font = new Font(preview.getDisplay(), data);
-			preview.setFont(font);
-			preview.getParent().layout();
-		}
-		
-		private void set(String value) {
-			setPreview(value);
-			if (annotation != null) {
-				if (property == NAME)
-					annotation.getContent().eSet(getFeature(), value);
-				else {
-					annotation.getContent().eSet(
-							getFeature(), new Integer(getValue(value)));
-				}
-			}
-		}
-		
-		public void create(Composite parent, TabbedPropertySheetWidgetFactory factory, String[] items) {
-			propertyCombo = factory.createCCombo(parent, SWT.READ_ONLY | SWT.BORDER);
-			propertyCombo.setItems(items);
-			propertyCombo.addSelectionListener(new SelectionListener() {
-			
-				public void widgetSelected(SelectionEvent e) {
-					set(propertyCombo.getText());
-				}
-			
-				public void widgetDefaultSelected(SelectionEvent e) {
-				}
-			});
-		}
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.ui.views.properties.tabbed.AbstractPropertySection#createControls(org.eclipse.swt.widgets.Composite, org.eclipse.ui.views.properties.tabbed.TabbedPropertySheetPage)
-	 */
-	@Override
-	public void createControls(Composite parent,
-			TabbedPropertySheetPage tabbedPropertySheetPage) {
-		super.createControls(parent, tabbedPropertySheetPage);
-		parent.setLayout(new GridLayout());
-		
-		TabbedPropertySheetWidgetFactory factory = tabbedPropertySheetPage.getWidgetFactory();
-		
-		Group group = factory.createGroup(parent, "Font");
-		group.setLayout(new GridLayout(3, false));
-		group.setLayoutData(new GridData(GridData.FILL_BOTH));
-		
-		nameProperty = new FontProperty(FontProperty.NAME);
-		nameProperty.create(group, factory, FontHelper.getFontNames());
-		
-		heightProperty = new FontProperty(FontProperty.HEIGHT);
-		heightProperty.create(group, factory, FontHelper.getFontSizes());
-		
-		styleProperty = new FontProperty(FontProperty.STYLE);
-		styleProperty.create(group, factory, new String[] { NORMAL, BOLD, ITALIC});
-		
-		preview = factory.createCLabel(group, "Example Text");
-		data = new FontData();
-		
-		GridData gridData = new GridData(GridData.FILL_BOTH);
-		gridData.horizontalSpan = 3;
-		gridData.verticalAlignment = SWT.BEGINNING;
-		preview.setLayoutData(gridData);
-	}
-	
-	protected void updateSection(Annotation annotation) {
-		this.annotation = annotation;
-		nameProperty.update();
-		heightProperty.update();
-		styleProperty.update();
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/Color.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/Color.java
deleted file mode 100644
index 94256fa..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/Color.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author Yuri Strot
- * @model
- */
-public interface Color extends EObject {
-	
-	/**
-	 * @model
-	 */
-	public int getRed();
-	
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getRed <em>Red</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Red</em>' attribute.
-	 * @see #getRed()
-	 * @generated
-	 */
-	void setRed(int value);
-
-	/**
-	 * @model
-	 */
-	public int getGreen();
-	
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getGreen <em>Green</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Green</em>' attribute.
-	 * @see #getGreen()
-	 * @generated
-	 */
-	void setGreen(int value);
-
-	/**
-	 * @model
-	 */
-	public int getBlue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getBlue <em>Blue</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Blue</em>' attribute.
-	 * @see #getBlue()
-	 * @generated
-	 */
-	void setBlue(int value);
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/Font.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/Font.java
deleted file mode 100644
index 61be97c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/Font.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author Yuri Strot
- * @model
- */
-public interface Font extends EObject {
-	
-	/**
-	 * @model
-	 */
-	public int getHeight();
-	
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getHeight <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Height</em>' attribute.
-	 * @see #getHeight()
-	 * @generated
-	 */
-	void setHeight(int value);
-
-	/**
-	 * @model
-	 */
-	public String getName();
-	
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * @model
-	 */
-	public int getStyle();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getStyle <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Style</em>' attribute.
-	 * @see #getStyle()
-	 * @generated
-	 */
-	void setStyle(int value);
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/StylesFactory.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/StylesFactory.java
deleted file mode 100644
index eac2f87..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/StylesFactory.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage
- * @generated
- */
-public interface StylesFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	StylesFactory eINSTANCE = org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.StylesFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Color</em>'.
-	 * @generated
-	 */
-	Color createColor();
-
-	/**
-	 * Returns a new object of class '<em>Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Font</em>'.
-	 * @generated
-	 */
-	Font createFont();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	StylesPackage getStylesPackage();
-
-} //StylesFactory
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/StylesPackage.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/StylesPackage.java
deleted file mode 100644
index e2a59bd..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/StylesPackage.java
+++ /dev/null
@@ -1,337 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesFactory
- * @model kind="package"
- * @generated
- */
-public interface StylesPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "styles";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.tigerstripe.annotation.ui.example.customview.styles";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	StylesPackage eINSTANCE = org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.StylesPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl <em>Color</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.StylesPackageImpl#getColor()
-	 * @generated
-	 */
-	int COLOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Red</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR__RED = 0;
-
-	/**
-	 * The feature id for the '<em><b>Green</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR__GREEN = 1;
-
-	/**
-	 * The feature id for the '<em><b>Blue</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR__BLUE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Color</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int COLOR_FEATURE_COUNT = 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl <em>Font</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.StylesPackageImpl#getFont()
-	 * @generated
-	 */
-	int FONT = 1;
-
-	/**
-	 * The feature id for the '<em><b>Height</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FONT__HEIGHT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FONT__NAME = 1;
-
-	/**
-	 * The feature id for the '<em><b>Style</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FONT__STYLE = 2;
-
-	/**
-	 * The number of structural features of the '<em>Font</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int FONT_FEATURE_COUNT = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color <em>Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Color</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color
-	 * @generated
-	 */
-	EClass getColor();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getRed <em>Red</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Red</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getRed()
-	 * @see #getColor()
-	 * @generated
-	 */
-	EAttribute getColor_Red();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getGreen <em>Green</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Green</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getGreen()
-	 * @see #getColor()
-	 * @generated
-	 */
-	EAttribute getColor_Green();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getBlue <em>Blue</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Blue</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color#getBlue()
-	 * @see #getColor()
-	 * @generated
-	 */
-	EAttribute getColor_Blue();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font <em>Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Font</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font
-	 * @generated
-	 */
-	EClass getFont();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getHeight <em>Height</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Height</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getHeight()
-	 * @see #getFont()
-	 * @generated
-	 */
-	EAttribute getFont_Height();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getName <em>Name</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Name</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getName()
-	 * @see #getFont()
-	 * @generated
-	 */
-	EAttribute getFont_Name();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getStyle <em>Style</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Style</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font#getStyle()
-	 * @see #getFont()
-	 * @generated
-	 */
-	EAttribute getFont_Style();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	StylesFactory getStylesFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl <em>Color</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl
-		 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.StylesPackageImpl#getColor()
-		 * @generated
-		 */
-		EClass COLOR = eINSTANCE.getColor();
-
-		/**
-		 * The meta object literal for the '<em><b>Red</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COLOR__RED = eINSTANCE.getColor_Red();
-
-		/**
-		 * The meta object literal for the '<em><b>Green</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COLOR__GREEN = eINSTANCE.getColor_Green();
-
-		/**
-		 * The meta object literal for the '<em><b>Blue</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute COLOR__BLUE = eINSTANCE.getColor_Blue();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl <em>Font</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl
-		 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.StylesPackageImpl#getFont()
-		 * @generated
-		 */
-		EClass FONT = eINSTANCE.getFont();
-
-		/**
-		 * The meta object literal for the '<em><b>Height</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FONT__HEIGHT = eINSTANCE.getFont_Height();
-
-		/**
-		 * The meta object literal for the '<em><b>Name</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FONT__NAME = eINSTANCE.getFont_Name();
-
-		/**
-		 * The meta object literal for the '<em><b>Style</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute FONT__STYLE = eINSTANCE.getFont_Style();
-
-	}
-
-} //StylesPackage
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/ColorImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/ColorImpl.java
deleted file mode 100644
index 5cb7c1b..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/ColorImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Color</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl#getRed <em>Red</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl#getGreen <em>Green</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.ColorImpl#getBlue <em>Blue</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class ColorImpl extends EObjectImpl implements Color {
-	/**
-	 * The default value of the '{@link #getRed() <em>Red</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRed()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int RED_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getRed() <em>Red</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getRed()
-	 * @generated
-	 * @ordered
-	 */
-	protected int red = RED_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getGreen() <em>Green</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGreen()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int GREEN_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getGreen() <em>Green</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getGreen()
-	 * @generated
-	 * @ordered
-	 */
-	protected int green = GREEN_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getBlue() <em>Blue</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBlue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int BLUE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getBlue() <em>Blue</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getBlue()
-	 * @generated
-	 * @ordered
-	 */
-	protected int blue = BLUE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ColorImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return StylesPackage.Literals.COLOR;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getRed() {
-		return red;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setRed(int newRed) {
-		int oldRed = red;
-		red = newRed;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StylesPackage.COLOR__RED, oldRed, red));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getGreen() {
-		return green;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setGreen(int newGreen) {
-		int oldGreen = green;
-		green = newGreen;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StylesPackage.COLOR__GREEN, oldGreen, green));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getBlue() {
-		return blue;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setBlue(int newBlue) {
-		int oldBlue = blue;
-		blue = newBlue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StylesPackage.COLOR__BLUE, oldBlue, blue));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case StylesPackage.COLOR__RED:
-				return new Integer(getRed());
-			case StylesPackage.COLOR__GREEN:
-				return new Integer(getGreen());
-			case StylesPackage.COLOR__BLUE:
-				return new Integer(getBlue());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case StylesPackage.COLOR__RED:
-				setRed(((Integer)newValue).intValue());
-				return;
-			case StylesPackage.COLOR__GREEN:
-				setGreen(((Integer)newValue).intValue());
-				return;
-			case StylesPackage.COLOR__BLUE:
-				setBlue(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case StylesPackage.COLOR__RED:
-				setRed(RED_EDEFAULT);
-				return;
-			case StylesPackage.COLOR__GREEN:
-				setGreen(GREEN_EDEFAULT);
-				return;
-			case StylesPackage.COLOR__BLUE:
-				setBlue(BLUE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case StylesPackage.COLOR__RED:
-				return red != RED_EDEFAULT;
-			case StylesPackage.COLOR__GREEN:
-				return green != GREEN_EDEFAULT;
-			case StylesPackage.COLOR__BLUE:
-				return blue != BLUE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (red: ");
-		result.append(red);
-		result.append(", green: ");
-		result.append(green);
-		result.append(", blue: ");
-		result.append(blue);
-		result.append(')');
-		return result.toString();
-	}
-
-} //ColorImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/FontImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/FontImpl.java
deleted file mode 100644
index cc2e5f3..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/FontImpl.java
+++ /dev/null
@@ -1,280 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Font</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl#getHeight <em>Height</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl.FontImpl#getStyle <em>Style</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class FontImpl extends EObjectImpl implements Font {
-	/**
-	 * The default value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int HEIGHT_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getHeight() <em>Height</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getHeight()
-	 * @generated
-	 * @ordered
-	 */
-	protected int height = HEIGHT_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAME_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getName() <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getName()
-	 * @generated
-	 * @ordered
-	 */
-	protected String name = NAME_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final int STYLE_EDEFAULT = 0;
-
-	/**
-	 * The cached value of the '{@link #getStyle() <em>Style</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getStyle()
-	 * @generated
-	 * @ordered
-	 */
-	protected int style = STYLE_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected FontImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return StylesPackage.Literals.FONT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getHeight() {
-		return height;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHeight(int newHeight) {
-		int oldHeight = height;
-		height = newHeight;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StylesPackage.FONT__HEIGHT, oldHeight, height));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-		return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setName(String newName) {
-		String oldName = name;
-		name = newName;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StylesPackage.FONT__NAME, oldName, name));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getStyle() {
-		return style;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setStyle(int newStyle) {
-		int oldStyle = style;
-		style = newStyle;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, StylesPackage.FONT__STYLE, oldStyle, style));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case StylesPackage.FONT__HEIGHT:
-				return new Integer(getHeight());
-			case StylesPackage.FONT__NAME:
-				return getName();
-			case StylesPackage.FONT__STYLE:
-				return new Integer(getStyle());
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case StylesPackage.FONT__HEIGHT:
-				setHeight(((Integer)newValue).intValue());
-				return;
-			case StylesPackage.FONT__NAME:
-				setName((String)newValue);
-				return;
-			case StylesPackage.FONT__STYLE:
-				setStyle(((Integer)newValue).intValue());
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case StylesPackage.FONT__HEIGHT:
-				setHeight(HEIGHT_EDEFAULT);
-				return;
-			case StylesPackage.FONT__NAME:
-				setName(NAME_EDEFAULT);
-				return;
-			case StylesPackage.FONT__STYLE:
-				setStyle(STYLE_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case StylesPackage.FONT__HEIGHT:
-				return height != HEIGHT_EDEFAULT;
-			case StylesPackage.FONT__NAME:
-				return NAME_EDEFAULT == null ? name != null : !NAME_EDEFAULT.equals(name);
-			case StylesPackage.FONT__STYLE:
-				return style != STYLE_EDEFAULT;
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (height: ");
-		result.append(height);
-		result.append(", name: ");
-		result.append(name);
-		result.append(", style: ");
-		result.append(style);
-		result.append(')');
-		return result.toString();
-	}
-
-} //FontImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/StylesFactoryImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/StylesFactoryImpl.java
deleted file mode 100644
index 612cad2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/StylesFactoryImpl.java
+++ /dev/null
@@ -1,115 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class StylesFactoryImpl extends EFactoryImpl implements StylesFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static StylesFactory init() {
-		try {
-			StylesFactory theStylesFactory = (StylesFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/tigerstripe/annotation/ui/example/customview/styles.ecore"); 
-			if (theStylesFactory != null) {
-				return theStylesFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new StylesFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StylesFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case StylesPackage.COLOR: return createColor();
-			case StylesPackage.FONT: return createFont();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Color createColor() {
-		ColorImpl color = new ColorImpl();
-		return color;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Font createFont() {
-		FontImpl font = new FontImpl();
-		return font;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StylesPackage getStylesPackage() {
-		return (StylesPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static StylesPackage getPackage() {
-		return StylesPackage.eINSTANCE;
-	}
-
-} //StylesFactoryImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/StylesPackageImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/StylesPackageImpl.java
deleted file mode 100644
index 08911a2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/impl/StylesPackageImpl.java
+++ /dev/null
@@ -1,269 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesFactory;
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class StylesPackageImpl extends EPackageImpl implements StylesPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass colorEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass fontEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private StylesPackageImpl() {
-		super(eNS_URI, StylesFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static StylesPackage init() {
-		if (isInited) return (StylesPackage)EPackage.Registry.INSTANCE.getEPackage(StylesPackage.eNS_URI);
-
-		// Obtain or create and register package
-		StylesPackageImpl theStylesPackage = (StylesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof StylesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new StylesPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theStylesPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theStylesPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theStylesPackage.freeze();
-
-		return theStylesPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getColor() {
-		return colorEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getColor_Red() {
-		return (EAttribute)colorEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getColor_Green() {
-		return (EAttribute)colorEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getColor_Blue() {
-		return (EAttribute)colorEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getFont() {
-		return fontEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFont_Height() {
-		return (EAttribute)fontEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFont_Name() {
-		return (EAttribute)fontEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getFont_Style() {
-		return (EAttribute)fontEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StylesFactory getStylesFactory() {
-		return (StylesFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		colorEClass = createEClass(COLOR);
-		createEAttribute(colorEClass, COLOR__RED);
-		createEAttribute(colorEClass, COLOR__GREEN);
-		createEAttribute(colorEClass, COLOR__BLUE);
-
-		fontEClass = createEClass(FONT);
-		createEAttribute(fontEClass, FONT__HEIGHT);
-		createEAttribute(fontEClass, FONT__NAME);
-		createEAttribute(fontEClass, FONT__STYLE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(colorEClass, Color.class, "Color", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getColor_Red(), ecorePackage.getEInt(), "red", null, 0, 1, Color.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getColor_Green(), ecorePackage.getEInt(), "green", null, 0, 1, Color.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getColor_Blue(), ecorePackage.getEInt(), "blue", null, 0, 1, Color.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(fontEClass, Font.class, "Font", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getFont_Height(), ecorePackage.getEInt(), "height", null, 0, 1, Font.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFont_Name(), ecorePackage.getEString(), "name", null, 0, 1, Font.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getFont_Style(), ecorePackage.getEInt(), "style", null, 0, 1, Font.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //StylesPackageImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/util/StylesAdapterFactory.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/util/StylesAdapterFactory.java
deleted file mode 100644
index 8f680a5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/util/StylesAdapterFactory.java
+++ /dev/null
@@ -1,147 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage
- * @generated
- */
-public class StylesAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static StylesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StylesAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = StylesPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected StylesSwitch<Adapter> modelSwitch =
-		new StylesSwitch<Adapter>() {
-			@Override
-			public Adapter caseColor(Color object) {
-				return createColorAdapter();
-			}
-			@Override
-			public Adapter caseFont(Font object) {
-				return createFontAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color <em>Color</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Color
-	 * @generated
-	 */
-	public Adapter createColorAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font <em>Font</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.Font
-	 * @generated
-	 */
-	public Adapter createFontAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //StylesAdapterFactory
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/util/StylesSwitch.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/util/StylesSwitch.java
deleted file mode 100644
index e0eb3d5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.customView/src/org/eclipse/tigerstripe/annotation/ui/example/customview/styles/util/StylesSwitch.java
+++ /dev/null
@@ -1,156 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.customview.styles.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.annotation.ui.example.customview.styles.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.customview.styles.StylesPackage
- * @generated
- */
-public class StylesSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static StylesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public StylesSwitch() {
-		if (modelPackage == null) {
-			modelPackage = StylesPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case StylesPackage.COLOR: {
-				Color color = (Color)theEObject;
-				T result = caseColor(color);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case StylesPackage.FONT: {
-				Font font = (Font)theEObject;
-				T result = caseFont(font);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Color</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Color</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseColor(Color object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Font</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Font</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseFont(Font object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //StylesSwitch
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/.classpath b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/.project b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/.project
deleted file mode 100644
index 75395c0..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotation.ui.example.editpartProvider</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/META-INF/MANIFEST.MF
deleted file mode 100644
index fa94bd6..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,11 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tigerstripe Annotation EditpartProvider Plug-in
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotation.ui.example.editpartProvider;singleton:=true
-Bundle-Version: 0.4.6.qualifier
-Bundle-Vendor: Eclipse.org
-Require-Bundle: org.eclipse.tigerstripe.annotation.ui.diagrams,
- org.eclipse.tigerstripe.annotation.core,
- org.eclipse.gmf.runtime.diagram.ui,
- org.eclipse.tigerstripe.annotation.ui,
- org.eclipse.tigerstripe.workbench.ui.base
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/build.properties b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/build.properties
deleted file mode 100644
index bc38bc0..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               model/
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/model/entityNote.ecore b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/model/entityNote.ecore
deleted file mode 100644
index 81b755a..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/model/entityNote.ecore
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="entityNote"
-    nsURI="http:///org/eclipse/tigerstripe/annotation/ui/example/entityNote.ecore"
-    nsPrefix="org.eclipse.tigerstripe.annotation.ui.example.entityNote">
-  <eClassifiers xsi:type="ecore:EClass" name="EntityNote">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="description" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/model/entityNote.genmodel b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/model/entityNote.genmodel
deleted file mode 100644
index 4fd742c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/model/entityNote.genmodel
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src"
-    modelPluginID="org.eclipse.tigerstripe.annotation.ui.example.editpartProvider"
-    modelName="EntityNote" importerID="org.eclipse.emf.importer.java" complianceLevel="5.0"
-    copyrightFields="false">
-  <foreignModel>@model</foreignModel>
-  <genPackages prefix="EntityNote" basePackage="org.eclipse.tigerstripe.annotation.ui.example"
-      disposableProviderFactory="true" ecorePackage="entityNote.ecore#/">
-    <genClasses ecoreClass="entityNote.ecore#//EntityNote">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute entityNote.ecore#//EntityNote/description"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/plugin.properties b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/plugin.properties
deleted file mode 100644
index 9b53bbd..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.1 2008/07/01 08:49:22 ystrot Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Annotation Edit Part Provider Example Plug-in
-providerName = Eclipse.org
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/plugin.xml b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/plugin.xml
deleted file mode 100644
index ecfaa51..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/plugin.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.tigerstripe.annotation.ui.diagrams.annotationEditpartProviders">
-      <provider
-            class="org.eclipse.tigerstripe.annotation.ui.example.editpartProvider.AnnotationEditPartProvider"
-            id="org.eclipse.tigerstripe.annotation.ui.example.personEditpartProvider">
-      </provider>
-   </extension>
-   
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http:///org/eclipse/tigerstripe/annotation/ui/example/entityNote.ecore" 
-       class = "org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage"
-       genModel = "model/entityNote.genmodel" /> 
-  </extension>
-   
-   <extension
-         point="org.eclipse.tigerstripe.annotation.core.annotationType">
-      <definition
-            description="Entity Note"
-            eclass="EntityNote"
-            epackage-uri="http:///org/eclipse/tigerstripe/annotation/ui/example/entityNote.ecore"
-            name="Entity Note">
-         <target
-               type="org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact"
-               unique="false">
-         </target>
-      </definition>
-   </extension>
-   
-   <extension
-         point="org.eclipse.tigerstripe.annotation.ui.annotationLabelProvider">
-      <provider
-            class="org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityLabelProvider"
-            epackage-uri="http:///org/eclipse/tigerstripe/annotation/ui/example/entityNote.ecore"
-            eclass="EntityNote"/>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/editpartProvider/AnnotationEditPartProvider.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/editpartProvider/AnnotationEditPartProvider.java
deleted file mode 100644
index 27b0462..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/editpartProvider/AnnotationEditPartProvider.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.editpartProvider;
-
-import org.eclipse.tigerstripe.annotation.core.Annotation;
-import org.eclipse.tigerstripe.annotation.ui.diagrams.parts.AnnotationEditPart;
-import org.eclipse.tigerstripe.annotation.ui.diagrams.parts.IAnnotationEditPartProvider;
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote;
-
-/**
- * @author Yuri Strot
- *
- */
-public class AnnotationEditPartProvider implements IAnnotationEditPartProvider {
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.tigerstripe.annotation.ui.diagrams.parts.IAnnotationEditPartProvider#getAnnotationEditPartClass(org.eclipse.tigerstripe.annotation.core.Annotation)
-	 */
-	public Class<? extends AnnotationEditPart> getAnnotationEditPartClass(
-			Annotation annotation) {
-		if (annotation.getContent() instanceof EntityNote)
-			return AnnotationImageEditPart.class;
-		return null;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/editpartProvider/AnnotationImageEditPart.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/editpartProvider/AnnotationImageEditPart.java
deleted file mode 100644
index 8f7c9f8..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/editpartProvider/AnnotationImageEditPart.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.editpartProvider;
-
-import org.eclipse.draw2d.Label;
-import org.eclipse.gmf.runtime.diagram.ui.figures.BorderedNodeFigure;
-import org.eclipse.gmf.runtime.gef.ui.figures.NodeFigure;
-import org.eclipse.gmf.runtime.notation.View;
-import org.eclipse.tigerstripe.annotation.core.Annotation;
-import org.eclipse.tigerstripe.annotation.ui.diagrams.parts.AnnotationEditPart;
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote;
-import org.eclipse.tigerstripe.annotation.ui.util.DisplayAnnotationUtil;
-
-/**
- * @author Yuri Strot
- *
- */
-public class AnnotationImageEditPart extends AnnotationEditPart {
-
-	/**
-	 * @param view
-	 */
-	public AnnotationImageEditPart(View view) {
-		super(view);
-	}
-
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeNodeEditPart#createNodeFigure()
-	 */
-	@Override
-	protected NodeFigure createNodeFigure() {
-		BorderedNodeFigure figure = new BorderedNodeFigure(new Label());
-		return figure;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.gmf.runtime.diagram.ui.editparts.ShapeEditPart#refreshVisuals()
-	 */
-	@Override
-	protected void refreshVisuals() {
-		BorderedNodeFigure figure = (BorderedNodeFigure)getFigure();
-		Label label = (Label)figure.getMainFigure();
-		Annotation annotation = getAnnotation();
-		EntityNote note = (EntityNote)annotation.getContent();
-		label.setText(note.getDescription());
-		label.setIcon(DisplayAnnotationUtil.getImage(annotation));
-		super.refreshVisuals();
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityLabelProvider.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityLabelProvider.java
deleted file mode 100644
index 9d8b7ee..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityLabelProvider.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote;
-
-import org.eclipse.jface.viewers.LabelProvider;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.tigerstripe.workbench.ui.internal.resources.Images;
-
-/**
- * @author Yuri Strot
- *
- */
-public class EntityLabelProvider extends LabelProvider {
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.LabelProvider#getText(java.lang.Object)
-	 */
-	@Override
-	public String getText(Object element) {
-		if (element instanceof EntityNote) {
-			EntityNote note = (EntityNote)element;
-			return "Entity Note: " + note.getDescription();
-		}
-		return null;
-	}
-	
-	/* (non-Javadoc)
-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-	 */
-	@Override
-	public Image getImage(Object element) {
-		return Images.get(Images.ENTITY_ICON);
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNote.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNote.java
deleted file mode 100644
index d0d4c2c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNote.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************* 
- * Copyright (c) 2008 xored software, Inc.  
- * 
- * All rights reserved. This program and the accompanying materials 
- * are 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  
- * 
- * Contributors: 
- *     xored software, Inc. - initial API and Implementation (Yuri Strot) 
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * @author Yuri Strot
- * @model
- */
-public interface EntityNote extends EObject {
-	
-	/**
-	 * @model
-	 */
-	public String getDescription();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote#getDescription <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Description</em>' attribute.
-	 * @see #getDescription()
-	 * @generated
-	 */
-	void setDescription(String value);
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNoteFactory.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNoteFactory.java
deleted file mode 100644
index 03cb6e0..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNoteFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNoteFactory.java,v 1.1 2008/07/01 08:49:22 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage
- * @generated
- */
-public interface EntityNoteFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EntityNoteFactory eINSTANCE = org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNoteFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Entity Note</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Entity Note</em>'.
-	 * @generated
-	 */
-	EntityNote createEntityNote();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	EntityNotePackage getEntityNotePackage();
-
-} //EntityNoteFactory
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNotePackage.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNotePackage.java
deleted file mode 100644
index 6e22c69..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/EntityNotePackage.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNotePackage.java,v 1.1 2008/07/01 08:49:22 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNoteFactory
- * @model kind="package"
- * @generated
- */
-public interface EntityNotePackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "entityNote";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/tigerstripe/annotation/ui/example/entityNote.ecore";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "org.eclipse.tigerstripe.annotation.ui.example.entityNote";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	EntityNotePackage eINSTANCE = org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNotePackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNoteImpl <em>Entity Note</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNoteImpl
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNotePackageImpl#getEntityNote()
-	 * @generated
-	 */
-	int ENTITY_NOTE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Description</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_NOTE__DESCRIPTION = 0;
-
-	/**
-	 * The number of structural features of the '<em>Entity Note</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ENTITY_NOTE_FEATURE_COUNT = 1;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote <em>Entity Note</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Entity Note</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote
-	 * @generated
-	 */
-	EClass getEntityNote();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote#getDescription <em>Description</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Description</em>'.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote#getDescription()
-	 * @see #getEntityNote()
-	 * @generated
-	 */
-	EAttribute getEntityNote_Description();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	EntityNoteFactory getEntityNoteFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNoteImpl <em>Entity Note</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNoteImpl
-		 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNotePackageImpl#getEntityNote()
-		 * @generated
-		 */
-		EClass ENTITY_NOTE = eINSTANCE.getEntityNote();
-
-		/**
-		 * The meta object literal for the '<em><b>Description</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ENTITY_NOTE__DESCRIPTION = eINSTANCE.getEntityNote_Description();
-
-	}
-
-} //EntityNotePackage
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNoteFactoryImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNoteFactoryImpl.java
deleted file mode 100644
index 7944f4f..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNoteFactoryImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNoteFactoryImpl.java,v 1.1 2008/07/01 08:49:23 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EntityNoteFactoryImpl extends EFactoryImpl implements EntityNoteFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EntityNoteFactory init() {
-		try {
-			EntityNoteFactory theEntityNoteFactory = (EntityNoteFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/tigerstripe/annotation/ui/example/entityNote.ecore"); 
-			if (theEntityNoteFactory != null) {
-				return theEntityNoteFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new EntityNoteFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityNoteFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case EntityNotePackage.ENTITY_NOTE: return createEntityNote();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityNote createEntityNote() {
-		EntityNoteImpl entityNote = new EntityNoteImpl();
-		return entityNote;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityNotePackage getEntityNotePackage() {
-		return (EntityNotePackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static EntityNotePackage getPackage() {
-		return EntityNotePackage.eINSTANCE;
-	}
-
-} //EntityNoteFactoryImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNoteImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNoteImpl.java
deleted file mode 100644
index 10108ec..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNoteImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNoteImpl.java,v 1.1 2008/07/01 08:49:23 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote;
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Entity Note</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl.EntityNoteImpl#getDescription <em>Description</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class EntityNoteImpl extends EObjectImpl implements EntityNote {
-	/**
-	 * The default value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String DESCRIPTION_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getDescription() <em>Description</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getDescription()
-	 * @generated
-	 * @ordered
-	 */
-	protected String description = DESCRIPTION_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntityNoteImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return EntityNotePackage.Literals.ENTITY_NOTE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getDescription() {
-		return description;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setDescription(String newDescription) {
-		String oldDescription = description;
-		description = newDescription;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, EntityNotePackage.ENTITY_NOTE__DESCRIPTION, oldDescription, description));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case EntityNotePackage.ENTITY_NOTE__DESCRIPTION:
-				return getDescription();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case EntityNotePackage.ENTITY_NOTE__DESCRIPTION:
-				setDescription((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case EntityNotePackage.ENTITY_NOTE__DESCRIPTION:
-				setDescription(DESCRIPTION_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case EntityNotePackage.ENTITY_NOTE__DESCRIPTION:
-				return DESCRIPTION_EDEFAULT == null ? description != null : !DESCRIPTION_EDEFAULT.equals(description);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (description: ");
-		result.append(description);
-		result.append(')');
-		return result.toString();
-	}
-
-} //EntityNoteImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNotePackageImpl.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNotePackageImpl.java
deleted file mode 100644
index b268243..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/impl/EntityNotePackageImpl.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNotePackageImpl.java,v 1.1 2008/07/01 08:49:23 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote;
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNoteFactory;
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class EntityNotePackageImpl extends EPackageImpl implements EntityNotePackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass entityNoteEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private EntityNotePackageImpl() {
-		super(eNS_URI, EntityNoteFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static EntityNotePackage init() {
-		if (isInited) return (EntityNotePackage)EPackage.Registry.INSTANCE.getEPackage(EntityNotePackage.eNS_URI);
-
-		// Obtain or create and register package
-		EntityNotePackageImpl theEntityNotePackage = (EntityNotePackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof EntityNotePackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new EntityNotePackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theEntityNotePackage.createPackageContents();
-
-		// Initialize created meta-data
-		theEntityNotePackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theEntityNotePackage.freeze();
-
-		return theEntityNotePackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getEntityNote() {
-		return entityNoteEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getEntityNote_Description() {
-		return (EAttribute)entityNoteEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityNoteFactory getEntityNoteFactory() {
-		return (EntityNoteFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		entityNoteEClass = createEClass(ENTITY_NOTE);
-		createEAttribute(entityNoteEClass, ENTITY_NOTE__DESCRIPTION);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(entityNoteEClass, EntityNote.class, "EntityNote", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getEntityNote_Description(), ecorePackage.getEString(), "description", null, 0, 1, EntityNote.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //EntityNotePackageImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/util/EntityNoteAdapterFactory.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/util/EntityNoteAdapterFactory.java
deleted file mode 100644
index 3b14b61..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/util/EntityNoteAdapterFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNoteAdapterFactory.java,v 1.1 2008/07/01 08:49:23 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage
- * @generated
- */
-public class EntityNoteAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EntityNotePackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityNoteAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = EntityNotePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected EntityNoteSwitch<Adapter> modelSwitch =
-		new EntityNoteSwitch<Adapter>() {
-			@Override
-			public Adapter caseEntityNote(EntityNote object) {
-				return createEntityNoteAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote <em>Entity Note</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNote
-	 * @generated
-	 */
-	public Adapter createEntityNoteAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //EntityNoteAdapterFactory
diff --git a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/util/EntityNoteSwitch.java b/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/util/EntityNoteSwitch.java
deleted file mode 100644
index ad91675..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.ui.example.editpartProvider/src/org/eclipse/tigerstripe/annotation/ui/example/entityNote/util/EntityNoteSwitch.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EntityNoteSwitch.java,v 1.1 2008/07/01 08:49:23 ystrot Exp $
- */
-package org.eclipse.tigerstripe.annotation.ui.example.entityNote.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.annotation.ui.example.entityNote.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotation.ui.example.entityNote.EntityNotePackage
- * @generated
- */
-public class EntityNoteSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static EntityNotePackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EntityNoteSwitch() {
-		if (modelPackage == null) {
-			modelPackage = EntityNotePackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case EntityNotePackage.ENTITY_NOTE: {
-				EntityNote entityNote = (EntityNote)theEObject;
-				T result = caseEntityNote(entityNote);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Entity Note</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Entity Note</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseEntityNote(EntityNote object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //EntityNoteSwitch
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.classpath b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.project b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.project
deleted file mode 100644
index eb71558..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.workbench.refactor.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index c91fd46..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Jul 23 11:26:18 BST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/META-INF/MANIFEST.MF
deleted file mode 100644
index b536cad..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,26 +0,0 @@
-Bundle-ManifestVersion: 2
-Bundle-Version: 1.0.0
-Manifest-Version: 1.0
-Require-Bundle: org.eclipse.ui,
- org.eclipse.tigerstripe.workbench.ui.base.test,
- com.windowtester.swt.runtime,
- com.windowtester.swing.runtime,
- org.eclipse.tigerstripe.workbench.base,
- org.junit,
- com.windowtester.runtime,
- com.instantiations.eclipse.debug,
- org.eclipse.jface,
- com.instantiations.common.core,
- org.eclipse.core.runtime,
- com.instantiations.eclipse.util,
- org.eclipse.swt,
- org.eclipse.ui.forms,
- org.eclipse.tigerstripe.workebnch.ui.visualeditor.test,
- org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram,
- com.windowtester.swt.runtime.gef,
- org.eclipse.draw2d,
- org.eclipse.tigerstripe.workbench.ui.visualeditor.adaptation
-Bundle-Activator: org.eclipse.tigerstripe.refactor.test.Activator
-Bundle-SymbolicName: org.eclipse.tigerstripe.workbench.refactor.test
-Bundle-Name: Refactor Test Plug-in
-Bundle-ActivationPolicy: lazy
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/build.properties b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/build.properties
deleted file mode 100644
index 34d2e4d..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/refactor-testcases.html b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/refactor-testcases.html
deleted file mode 100644
index f2ad8c9..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/refactor-testcases.html
+++ /dev/null
@@ -1,73 +0,0 @@
-<h1>Refactor Test Cases</h1>
-<small>$Id: refactor-testcases.html,v 1.1 2009/01/08 20:51:10 edillon Exp $</small>
-<p>This page describes the tests performed on refactoring scenarios with Tigerstripe.</p>
-<p>The tests are using a test model that available as
-<div>
-<tt>:pserver:anonymous@dev.eclipse.org,/cvsroot/technology, org.eclipse.tigerstripe/samples/test-models/model-refactoring</tt>
-</div>
-</p>
-
-<h2>1. Vanilla Refactoring - no diagrams</h2>
-<p>These scenario cover basic refactoring, looking at maintaining references between artifacts.</p>
-<p>The 'model-refactoring' model contains diagrams that need to be deleted before these tests are performed to avoid diagram-sync side effects.</p>
-<table bordercolor="#000000" border="1px">
-	<tr>
-		<th>JUnit test</th>
-		<th>High Level Scenario</th>
-		<th>Comments</th>
-	</tr>
-	<tr>
-		<td>Not implemented</td>
-		<td><strong>Simple Refactor->Rename...</strong>
-			<ul>
-				<li>rename Ent1 to Ent10: check all references are updated. Also check that 'implementing/Implemented' and 'extending/extended' lists are updated.</li>
-				<li>rename Enumeration0 to Enumeration10: check attribute in Ent10 is updated.</li>
-				<li>rename DataMiddle to DataMiddle0: check datatype hierarchy is fine and attributes referecing DataMiddle are updated.</li>
-				<li>rename DataBottom to DataBottom0: check the self reference "recur" is fine</li>
-				<li>rename Association0 to Association00: check in artmgr for getOutgoing and Incoming associations to make sure all indexes have been updated</li>
-				<li>rename AssociationClass0 to AssociationClass00</li>
-				<li>rename 'simple' package to 'complicated'</li>
-			</ul>
-		</td>
-		<td>
-			Basic tests around renaming various types of nodes/edges.
-		</td>
-	</tr>
-	<tr>
-		<td>Not implemented</td>
-		<td><strong>Refactor->Move... in Explorer</strong>
-			<ul>
-				<li>move Ent1 to 'moved' package</li>
-				<li>Select all 3 datatypes, move them to 'moved' package</li>
-				<li>select 'moved' (containing Ent1, and all datatypes), move into 'movedOther'</li>
-			</ul>
-		</td>
-		<td>
-			Dnd moves of single, multiple nodes and packages.
-		</td>
-	</tr>
-	<tr>
-		<td>Not implemented</td>
-		<td><strong>DnD Move in Explorer</strong>
-			<ul>
-				<li>move Ent1 to 'moved' package</li>
-				<li>Select all 3 datatypes, move them to 'moved' package</li>
-				<li>select 'moved' (containing Ent1, and all datatypes), move into 'movedOther'</li>
-			</ul>
-		</td>
-		<td>
-			Dnd moves of single, multiple nodes and packages.
-		</td>
-	</tr>
-</table>
-
-<h2>2. Refactoring with Diagrams</h2>
-<p>This sets repeats the tests from (1.) above with all diagrams present. Then additional tests are done around refactoring diagrams themselves.<p>
-<p>Open and closed diagrams need to be considered, both Class and Instance diagrams.</p>
-<p>It is also important to have diagrams within the packages themselves, as well as outside of all packages</p>
-<p>Finally, renames should be triggered both from the Explorer and from a diagram.</p>
-
-<h2>3. Refactoring with Annotations</h2>
-<p>Everything included in (2.) above, with annotations in the model.</p>
-
-
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/DnDTests.java b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/DnDTests.java
deleted file mode 100644
index dc84607..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/DnDTests.java
+++ /dev/null
@@ -1,208 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - rcraddoc
- *******************************************************************************/
-package org.eclipse.tigerstripe.refactor.Vanilla;
-
-import java.util.ArrayList;
-
-import org.eclipse.tigerstripe.refactor.artifact.Association0_to_Association00;
-import org.eclipse.tigerstripe.refactor.artifact.AssociationClass0_to_AssociationClass00;
-import org.eclipse.tigerstripe.refactor.artifact.DataBottom_to_DataBottom0;
-import org.eclipse.tigerstripe.refactor.artifact.DataMiddle_to_DataMiddle0;
-import org.eclipse.tigerstripe.refactor.artifact.Dependency0_to_Dependency00;
-import org.eclipse.tigerstripe.refactor.artifact.Ent1_to_Ent10;
-import org.eclipse.tigerstripe.refactor.artifact.Enumeration0_to_Enumeration00;
-import org.eclipse.tigerstripe.refactor.artifact.Event0_to_Event00;
-import org.eclipse.tigerstripe.refactor.artifact.Exception0_to_Exception00;
-import org.eclipse.tigerstripe.refactor.artifact.Query0_to_Query00;
-import org.eclipse.tigerstripe.refactor.artifact.Session0_to_Session00;
-import org.eclipse.tigerstripe.refactor.artifact.Update0_to_Update00;
-import org.eclipse.tigerstripe.refactor.project.ProjectHelper;
-import org.eclipse.tigerstripe.refactor.project.TestInitialPackageContents;
-import org.eclipse.tigerstripe.workbench.ui.base.test.project.ArtifactHelper;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.WT;
-import com.windowtester.runtime.swt.UITestCaseSWT;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.CTabItemLocator;
-import com.windowtester.runtime.swt.locator.LabeledTextLocator;
-import com.windowtester.runtime.swt.locator.TableItemLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-import com.windowtester.runtime.swt.locator.eclipse.ContributedToolItemLocator;
-import com.windowtester.runtime.swt.locator.eclipse.ViewLocator;
-
-public class DnDTests extends UITestCaseSWT {
-
-		private ProjectHelper helper;
-		private ArtifactHelper artifactHelper;
-		private IUIContext ui;
-		private ViewLocator view;
-		
-		public void setUp() throws Exception{
-			ui = getUI();
-			helper = new ProjectHelper();
-			artifactHelper = new ArtifactHelper();
-			
-			helper.reloadProjectFromCVS(ui);
-			
-			// In this test case we don't want any diagrams.....
-			// There are 4 diagrams
-			helper.deleteDiagrams(ui);
-				
-			view = new ViewLocator(
-			"org.eclipse.tigerstripe.workbench.views.artifactExplorerViewNew");
-
-		}
-		
-		
-		public void testRenames() throws Exception {
-			
-			
-			
-			// This is a single move
-
-			Ent1_to_Ent10.openRelatedEditors(ui);
-			Ent1_to_Ent10.doChangeByDnd(ui);
-			// Note this one needs a dot at the end of the package
-			// because by default there is no package
-			Ent1_to_Ent10.checkExplorerUpdates(ui,"simple.moved.","Ent1");
-			Ent1_to_Ent10.checkAPI("simple.moved","Ent1");
-			Ent1_to_Ent10.checkEditorUpdated(ui,"simple.moved","Ent1");
-			Ent1_to_Ent10.saveAndCloseRelatedEditors(ui);
-				
-			multipleMove();
-			
-			
-		}
-	
-		
-		public void multipleMove() throws Exception{
-
-			String project="model-refactoring";
-			
-			// Open the editors
-			
-			String[] editors = {"simple/AssociatedEnt", "simple/moved/Ent1"};
-			for (String editor : editors){
-				ui.click(2,	new TreeItemLocator(project+"/src/" + editor,view));
-			}
-			
-			
-			
-			ui.click(new TreeItemLocator(
-					project+"/src/simple/DataTop",
-					view));
-			ui.click(
-					1,
-					new TreeItemLocator(
-							project+"/src/simple/DataMiddle",
-							view),
-							WT.CTRL);
-			ui.click(
-					1,
-					new TreeItemLocator(
-							project+"/src/simple/DataBottom",
-							view),
-							WT.CTRL);
-
-			ui
-			.dragTo(new TreeItemLocator(
-					"model-refactoring/src/simple/moved",
-					new ViewLocator(
-							"org.eclipse.tigerstripe.workbench.views.artifactExplorerViewNew")));
-			ui.wait(new ShellShowingCondition("Move"));
-			ui.click(new ButtonLocator("OK"));
-			ui.wait(new ShellDisposedCondition("Move"));
-			
-			
-			
-			
-			// Now what to test for?
-			// Explorer tests
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "simple.moved", "DataTop");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "simple.moved", "DataMiddle");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "simple.moved", "DataBottom");
-			
-			ArrayList<String> items = new ArrayList<String>();
-			items.add("attribute1"+":"+"DataMiddle");
-			ArtifactHelper.checkItemsInExplorer(ui,project,
-					"simple.moved","Ent1",items);
-			
-			items = new ArrayList<String>();
-			items.add("attribute0"+":"+"DataMiddle");
-			ArtifactHelper.checkItemsInExplorer(ui,project,
-					"simple","AssociatedEnt",items);
-			
-			items = new ArrayList<String>();
-			items.add("recur"+":"+"DataBottom");
-			ArtifactHelper.checkItemsInExplorer(ui,project,
-					"simple.moved","DataBottom",items);
-			
-			
-			
-			// Editor tests
-			// First open the editors for the moved objects
-			String[] ownEditors = {"simple/moved/DataTop" , "simple/moved/DataMiddle" , "simple/moved/DataBottom"};
-			for (String editor : ownEditors){
-				ui.click(2,	new TreeItemLocator(project+"/src/" + editor,view));
-			}
-			
-
-			ui.click(new CTabItemLocator("DataBottom"));
-			// Check for Extends in this one
-			LabeledTextLocator extend = new LabeledTextLocator("Extends: ");
-			assertEquals("Extended type not updated in Editor","simple.moved.DataMiddle",extend.getText(ui));
-			
-			// Check for An AttributeRef
-			TableItemLocator attributeNameInTable = new TableItemLocator("recur");
-			ui.click(attributeNameInTable);
-			LabeledTextLocator type = new LabeledTextLocator("Type: ");
-			assertEquals("Referenced type not updated in Editor","simple.moved.DataBottom",type.getText(ui));
-			
-			ui.click(new CTabItemLocator("*Ent1"));
-			// Check for An AttributeRef
-			 attributeNameInTable = new TableItemLocator("attribute1");
-			ui.click(attributeNameInTable);
-			type = new LabeledTextLocator("Type: ");
-			assertEquals("Referenced type not updated in Editor","simple.moved.DataMiddle",type.getText(ui));
-			
-			ui.click(new CTabItemLocator("*AssociatedEnt"));
-			// Check for An AttributeRef
-			attributeNameInTable = new TableItemLocator("attribute0");
-			ui.click(attributeNameInTable);
-			type = new LabeledTextLocator("Type: ");
-			assertEquals("Referenced type not updated in Editor","simple.moved.DataMiddle",type.getText(ui));
-
-			
-			// Checks for Top
-			ui.click(new CTabItemLocator("DataMiddle"));
-			// Check for Extends in this one
-			extend = new LabeledTextLocator("Extends: ");
-			assertEquals("Extended type not updated in Editor","simple.moved.DataTop",extend.getText(ui));
-			
-			String[] shortEditors = {"AssociatedEnt", "Ent1"};
-			for (String editor : shortEditors){
-				ui.click(new CTabItemLocator("*"+editor));
-				ui.click(new ContributedToolItemLocator("org.eclipse.ui.file.save"));
-				ui.close(new CTabItemLocator(editor));
-			}
-			
-			String[] shortOwnEditors = {"DataTop", "DataMiddle", "DataBottom"};
-			for (String editor : shortOwnEditors){
-				ui.close(new CTabItemLocator(editor));
-			}
-			
-		}
-
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/MoveTests.java b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/MoveTests.java
deleted file mode 100644
index 74cbe74..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/MoveTests.java
+++ /dev/null
@@ -1,213 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - rcraddoc
- *******************************************************************************/
-package org.eclipse.tigerstripe.refactor.Vanilla;
-
-import java.util.ArrayList;
-
-import org.eclipse.tigerstripe.refactor.artifact.Association0_to_Association00;
-import org.eclipse.tigerstripe.refactor.artifact.AssociationClass0_to_AssociationClass00;
-import org.eclipse.tigerstripe.refactor.artifact.DataBottom_to_DataBottom0;
-import org.eclipse.tigerstripe.refactor.artifact.DataMiddle_to_DataMiddle0;
-import org.eclipse.tigerstripe.refactor.artifact.Dependency0_to_Dependency00;
-import org.eclipse.tigerstripe.refactor.artifact.Ent1_to_Ent10;
-import org.eclipse.tigerstripe.refactor.artifact.Enumeration0_to_Enumeration00;
-import org.eclipse.tigerstripe.refactor.artifact.Event0_to_Event00;
-import org.eclipse.tigerstripe.refactor.artifact.Exception0_to_Exception00;
-import org.eclipse.tigerstripe.refactor.artifact.Query0_to_Query00;
-import org.eclipse.tigerstripe.refactor.artifact.Session0_to_Session00;
-import org.eclipse.tigerstripe.refactor.artifact.Update0_to_Update00;
-import org.eclipse.tigerstripe.refactor.project.ProjectHelper;
-import org.eclipse.tigerstripe.refactor.project.TestInitialPackageContents;
-import org.eclipse.tigerstripe.workbench.ui.base.test.project.ArtifactHelper;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.WT;
-import com.windowtester.runtime.swt.UITestCaseSWT;
-import com.windowtester.runtime.swt.condition.shell.ShellDisposedCondition;
-import com.windowtester.runtime.swt.condition.shell.ShellShowingCondition;
-import com.windowtester.runtime.swt.locator.ButtonLocator;
-import com.windowtester.runtime.swt.locator.CTabItemLocator;
-import com.windowtester.runtime.swt.locator.LabeledTextLocator;
-import com.windowtester.runtime.swt.locator.TableItemLocator;
-import com.windowtester.runtime.swt.locator.TreeItemLocator;
-import com.windowtester.runtime.swt.locator.eclipse.ContributedToolItemLocator;
-import com.windowtester.runtime.swt.locator.eclipse.ViewLocator;
-
-public class MoveTests extends UITestCaseSWT {
-
-		public ProjectHelper helper;
-		public ArtifactHelper artifactHelper;
-		public IUIContext ui;
-		public ViewLocator view;
-		
-		public void setUp() throws Exception{
-			ui = getUI();
-			helper = new ProjectHelper();
-			artifactHelper = new ArtifactHelper();
-			
-			helper.reloadProjectFromCVS(ui);
-			
-			// In this test case we don't want any diagrams.....
-			// There are 4 diagrams
-			helper.deleteDiagrams(ui);
-				
-			view = new ViewLocator(
-			"org.eclipse.tigerstripe.workbench.views.artifactExplorerViewNew");
-
-		}
-		
-		
-		public void testRenames() throws Exception {
-			
-			
-			
-			// This is a single move
-
-			Ent1_to_Ent10.openRelatedEditors(ui);
-			Ent1_to_Ent10.doChangeByMove(ui);
-			// Note this one needs a dot at the end of the package
-			// because by default there is no package
-			Ent1_to_Ent10.checkExplorerUpdates(ui,"simple.moved.","Ent1");
-			Ent1_to_Ent10.checkAPI("simple.moved","Ent1");
-			Ent1_to_Ent10.checkEditorUpdated(ui,"simple.moved","Ent1");
-			Ent1_to_Ent10.saveAndCloseRelatedEditors(ui);
-				
-			multipleMove();
-			doChecks();
-			
-			
-		}
-	
-		
-		public void multipleMove() throws Exception{
-
-			String project="model-refactoring";
-			
-			// Open the editors
-			
-			String[] editors = {"simple/AssociatedEnt", "simple/moved/Ent1"};
-			for (String editor : editors){
-				ui.click(2,	new TreeItemLocator(project+"/src/" + editor,view));
-			}
-			
-			
-			
-			ui.click(new TreeItemLocator(
-					project+"/src/simple/DataTop",
-					view));
-			ui.click(
-					1,
-					new TreeItemLocator(
-							project+"/src/simple/DataMiddle",
-							view),
-							WT.CTRL);
-			ui.click(
-					1,
-					new TreeItemLocator(
-							project+"/src/simple/DataBottom",
-							view),
-							WT.CTRL);
-
-			ui.contextClick(
-					new TreeItemLocator(
-							project+"/src/simple/DataBottom",
-							view),
-				"Refactor/Move...");
-			ui.wait(new ShellDisposedCondition("Progress Information"));
-			ui.wait(new ShellShowingCondition("Move"));
-			ui.click(new TreeItemLocator("model-refactoring/src/simple.moved"));
-			ui.click(new ButtonLocator("OK"));
-			ui.wait(new ShellDisposedCondition("Move"));
-			
-		}
-		
-		public void doChecks() throws Exception {
-			
-			String project="model-refactoring";
-			// Now what to test for?
-			// Explorer tests
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "simple.moved", "DataTop");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "simple.moved", "DataMiddle");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "simple.moved", "DataBottom");
-			
-			ArrayList<String> items = new ArrayList<String>();
-			items.add("attribute1"+":"+"DataMiddle");
-			ArtifactHelper.checkItemsInExplorer(ui,project,
-					"simple.moved","Ent1",items);
-			
-			items = new ArrayList<String>();
-			items.add("attribute0"+":"+"DataMiddle");
-			ArtifactHelper.checkItemsInExplorer(ui,project,
-					"simple","AssociatedEnt",items);
-			
-			items = new ArrayList<String>();
-			items.add("recur"+":"+"DataBottom");
-			ArtifactHelper.checkItemsInExplorer(ui,project,
-					"simple.moved","DataBottom",items);
-			
-			
-			
-			// Editor tests
-			// First open the editors for the moved objects
-			String[] ownEditors = {"simple/moved/DataTop" , "simple/moved/DataMiddle" , "simple/moved/DataBottom"};
-			for (String editor : ownEditors){
-				ui.click(2,	new TreeItemLocator(project+"/src/" + editor,view));
-			}
-			
-
-			ui.click(new CTabItemLocator("DataBottom"));
-			// Check for Extends in this one
-			LabeledTextLocator extend = new LabeledTextLocator("Extends: ");
-			assertEquals("Extended type not updated in Editor","simple.moved.DataMiddle",extend.getText(ui));
-			
-			// Check for An AttributeRef
-			TableItemLocator attributeNameInTable = new TableItemLocator("recur");
-			ui.click(attributeNameInTable);
-			LabeledTextLocator type = new LabeledTextLocator("Type: ");
-			assertEquals("Referenced type not updated in Editor","simple.moved.DataBottom",type.getText(ui));
-			
-			ui.click(new CTabItemLocator("*Ent1"));
-			// Check for An AttributeRef
-			 attributeNameInTable = new TableItemLocator("attribute1");
-			ui.click(attributeNameInTable);
-			type = new LabeledTextLocator("Type: ");
-			assertEquals("Referenced type not updated in Editor","simple.moved.DataMiddle",type.getText(ui));
-			
-			ui.click(new CTabItemLocator("*AssociatedEnt"));
-			// Check for An AttributeRef
-			attributeNameInTable = new TableItemLocator("attribute0");
-			ui.click(attributeNameInTable);
-			type = new LabeledTextLocator("Type: ");
-			assertEquals("Referenced type not updated in Editor","simple.moved.DataMiddle",type.getText(ui));
-
-			
-			// Checks for Top
-			ui.click(new CTabItemLocator("DataMiddle"));
-			// Check for Extends in this one
-			extend = new LabeledTextLocator("Extends: ");
-			assertEquals("Extended type not updated in Editor","simple.moved.DataTop",extend.getText(ui));
-			
-			String[] shortEditors = {"AssociatedEnt", "Ent1"};
-			for (String editor : shortEditors){
-				ui.click(new CTabItemLocator("*"+editor));
-				ui.click(new ContributedToolItemLocator("org.eclipse.ui.file.save"));
-				ui.close(new CTabItemLocator(editor));
-			}
-			
-			String[] shortOwnEditors = {"DataTop", "DataMiddle", "DataBottom"};
-			for (String editor : shortOwnEditors){
-				ui.close(new CTabItemLocator(editor));
-			}
-			
-		}
-
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/RenamePackage.java b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/RenamePackage.java
deleted file mode 100644
index 54b8d24..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/RenamePackage.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - rcraddoc
- *******************************************************************************/
-package org.eclipse.tigerstripe.refactor.Vanilla;
-
-import org.eclipse.tigerstripe.refactor.artifact.Association0_to_Association00;
-import org.eclipse.tigerstripe.refactor.artifact.AssociationClass0_to_AssociationClass00;
-import org.eclipse.tigerstripe.refactor.artifact.DataBottom_to_DataBottom0;
-import org.eclipse.tigerstripe.refactor.artifact.DataMiddle_to_DataMiddle0;
-import org.eclipse.tigerstripe.refactor.artifact.Ent1_to_Ent10;
-import org.eclipse.tigerstripe.refactor.artifact.Enumeration0_to_Enumeration00;
-import org.eclipse.tigerstripe.refactor.artifact.Session0_to_Session00;
-import org.eclipse.tigerstripe.refactor.pckge.Simple_to_Complicated;
-import org.eclipse.tigerstripe.refactor.project.ProjectHelper;
-import org.eclipse.tigerstripe.workbench.ui.base.test.project.ArtifactHelper;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.UITestCaseSWT;
-import com.windowtester.runtime.swt.locator.eclipse.ViewLocator;
-
-public class RenamePackage extends UITestCaseSWT {
-
-		private IUIContext ui;
-
-		
-		public void testPackageRename() throws Exception {
-						
-			/**
-			 * Rename the package!
-			 * 
-			 */
-			IUIContext ui = getUI();
-			Simple_to_Complicated.doChangeThroughExplorer(ui);
-			Simple_to_Complicated.checkAPI();
-			Simple_to_Complicated.checkExplorerUpdates(ui);
-			
-			
-		}
-		
-		
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/TestRenamedPackageContents.java b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/TestRenamedPackageContents.java
deleted file mode 100644
index 6d8aaba..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/TestRenamedPackageContents.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - rcraddoc
- *******************************************************************************/
-package org.eclipse.tigerstripe.refactor.Vanilla;
-
-import org.eclipse.tigerstripe.refactor.artifact.Association0_to_Association00;
-import org.eclipse.tigerstripe.refactor.artifact.AssociationClass0_to_AssociationClass00;
-import org.eclipse.tigerstripe.refactor.artifact.DataBottom_to_DataBottom0;
-import org.eclipse.tigerstripe.refactor.artifact.DataMiddle_to_DataMiddle0;
-import org.eclipse.tigerstripe.refactor.artifact.Ent1_to_Ent10;
-import org.eclipse.tigerstripe.refactor.artifact.Enumeration0_to_Enumeration00;
-import org.eclipse.tigerstripe.refactor.artifact.Session0_to_Session00;
-import org.eclipse.tigerstripe.refactor.pckge.Simple_to_Complicated;
-import org.eclipse.tigerstripe.refactor.project.ProjectHelper;
-import org.eclipse.tigerstripe.workbench.ui.base.test.project.ArtifactHelper;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.UITestCaseSWT;
-import com.windowtester.runtime.swt.locator.eclipse.ViewLocator;
-
-public class TestRenamedPackageContents extends UITestCaseSWT {
-
-		
-		private static String project="model-refactoring";
-		
-		
-		public void testForAllRenamedArtifacts() throws Exception {
-			IUIContext ui = getUI();
-			// Check we still have all of our artifacts?
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Ent10");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Ent2");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "SuperEnt");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "AssociatedEnt");
-			
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Association00");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Association1");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Association2");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "AssociationClass00");
-			
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "DataTop");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "DataMiddle0");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "DataBottom0");
-			
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Enumeration00");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Query00");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Update00");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Dependency00");
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "Exception00");
-			
-			ArtifactHelper.checkArtifactInExplorer(ui, project, "complicated", "SessionFacade00");
-			
-			ArtifactHelper.checkPackageInExplorer(ui, project, "complicated.moved");
-			ArtifactHelper.checkPackageInExplorer(ui, project, "complicated.movedOther");
-			
-		}
-		
-		public void testForExtraComponentInExplorer() throws Exception {
-			//TODO Find out what is extra - In ONE simple message!
-		}
-		
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/VanillaTests.java b/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/VanillaTests.java
deleted file mode 100644
index fad6c3a..0000000
--- a/plugins/org.eclipse.tigerstripe.workbench.refactor.test/src/org/eclipse/tigerstripe/refactor/Vanilla/VanillaTests.java
+++ /dev/null
@@ -1,210 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2008 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are 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
- *
- * Contributors:
- *    Cisco Systems, Inc. - rcraddoc
- *******************************************************************************/
-package org.eclipse.tigerstripe.refactor.Vanilla;
-
-import org.eclipse.tigerstripe.refactor.artifact.Association0_to_Association00;
-import org.eclipse.tigerstripe.refactor.artifact.AssociationClass0_to_AssociationClass00;
-import org.eclipse.tigerstripe.refactor.artifact.DataBottom_to_DataBottom0;
-import org.eclipse.tigerstripe.refactor.artifact.DataMiddle_to_DataMiddle0;
-import org.eclipse.tigerstripe.refactor.artifact.Dependency0_to_Dependency00;
-import org.eclipse.tigerstripe.refactor.artifact.Ent1_to_Ent10;
-import org.eclipse.tigerstripe.refactor.artifact.Enumeration0_to_Enumeration00;
-import org.eclipse.tigerstripe.refactor.artifact.Event0_to_Event00;
-import org.eclipse.tigerstripe.refactor.artifact.Exception0_to_Exception00;
-import org.eclipse.tigerstripe.refactor.artifact.Query0_to_Query00;
-import org.eclipse.tigerstripe.refactor.artifact.Session0_to_Session00;
-import org.eclipse.tigerstripe.refactor.artifact.Update0_to_Update00;
-import org.eclipse.tigerstripe.refactor.project.ProjectHelper;
-import org.eclipse.tigerstripe.refactor.project.TestInitialPackageContents;
-import org.eclipse.tigerstripe.workbench.ui.base.test.project.ArtifactHelper;
-
-import com.windowtester.runtime.IUIContext;
-import com.windowtester.runtime.swt.UITestCaseSWT;
-import com.windowtester.runtime.swt.locator.eclipse.ViewLocator;
-
-public class VanillaTests extends UITestCaseSWT {
-
-		private ProjectHelper helper;
-		private ArtifactHelper artifactHelper;
-		private IUIContext ui;
-		private ViewLocator view;
-		
-		public void setUp() throws Exception{
-			ui = getUI();
-			helper = new ProjectHelper();
-			artifactHelper = new ArtifactHelper();
-			
-			helper.loadProjectFromCVS(ui);
-			
-			// In this test case we don't want any diagrams.....
-			// There are 4 diagrams
-			helper.deleteDiagrams(ui);
-				
-			view = new ViewLocator(
-			"org.eclipse.tigerstripe.workbench.views.artifactExplorerViewNew");
-
-		}
-		
-		
-		public void testRenames() throws Exception {
-			
-			/**
-			 * Ent 1 was used in:
-			 * 	Association0 - Zend - called ent1_0
-			 *  Association1 - AEnd, Zend
-			 *  Associati