This commit was manufactured by cvs2svn to create tag 'v200903091620'.
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.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/patterns/PatternTest.java b/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/patterns/PatternTest.java
index 01dfda0..e312126 100644
--- a/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/patterns/PatternTest.java
+++ b/plugins/org.eclipse.tigerstripe.workbench.base.test/src/org/eclipse/tigerstripe/workbench/base/test/patterns/PatternTest.java
@@ -209,7 +209,7 @@
 		String entityName = "mynewUpdate";
 		String patternname = "org.eclipse.tigerstripe.workbench.base.UpdateProcedure";
 
-		testNodePatternArtifact(patternname, targetPackage, entityName);
+		//testNodePatternArtifact(patternname, targetPackage, entityName);
 
 	}
 
diff --git a/releng/org.eclipse.tigerstripe.update-site/.project b/releng/org.eclipse.tigerstripe.update-site/.project
deleted file mode 100644
index fcb5fee..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.updateSite</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.UpdateSiteBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.UpdateSiteNature</nature>
-	</natures>
-</projectDescription>
diff --git a/releng/org.eclipse.tigerstripe.update-site/index-interim.html b/releng/org.eclipse.tigerstripe.update-site/index-interim.html
deleted file mode 100644
index 93121d0..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/index-interim.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<html>
-<head>
-<title>Tigerstripe Interim Update Site</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>
-@import url("web/site.css");
-</style>
-<script type="text/javascript">
-	var returnval = 0;
-	var stylesheet, xmlFile, cache, doc;
-	function init(){
-		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
-		// Use the standard DOM Level 2 technique, if it is supported
-		if (document.implementation && document.implementation.createDocument) {
-			xmlFile = document.implementation.createDocument("", "", null);
-			stylesheet = document.implementation.createDocument("", "", null);
-			if (xmlFile.load){
-				xmlFile.load("site-interim.xml");
-				stylesheet.load("web/site-interim.xsl");
-			} else {
-				alert("Document could not be loaded by browser.");
-			}
-			xmlFile.addEventListener("load", transform, false);
-			stylesheet.addEventListener("load", transform, false);
-		}
-		//IE 6.0+ solution
-		else if (window.ActiveXObject) {
-			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-			xmlFile.async = false;
-			xmlFile.load("site-interim.xml");
-			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-			stylesheet.async = false;
-			stylesheet.load("web/site-interim.xsl");
-			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-			cache.stylesheet = stylesheet;
-			transformData();
-		}
-	}
-	// separate transformation function for IE 6.0+
-	function transformData(){
-		var processor = cache.createProcessor();
-		processor.input = xmlFile;
-		processor.transform();
-		data.innerHTML = processor.output;
-	}
-	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
-	function transform(){
-		returnval+=1;
-		if (returnval==2){
-			var processor = new XSLTProcessor();
-			processor.importStylesheet(stylesheet); 
-			doc = processor.transformToDocument(xmlFile);
-			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
-		}
-	}
-</script>
-</head>
-<body onload="init();">
-<p><strong>This site contains interim versions that may be un-stable. Please
-use the <a href="index.html">official Tigerstripe Update Site</a> for
-stable releases.</strong></p>
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/releng/org.eclipse.tigerstripe.update-site/index.html b/releng/org.eclipse.tigerstripe.update-site/index.html
deleted file mode 100644
index 36249da..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/index.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<html>
-<head>
-<title>Tigerstripe Update Site</title>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<style>@import url("web/site.css");</style>
-<script type="text/javascript">
-	var returnval = 0;
-	var stylesheet, xmlFile, cache, doc;
-	function init(){
-		// NSCP 7.1+ / Mozilla 1.4.1+ / Safari
-		// Use the standard DOM Level 2 technique, if it is supported
-		if (document.implementation && document.implementation.createDocument) {
-			xmlFile = document.implementation.createDocument("", "", null);
-			stylesheet = document.implementation.createDocument("", "", null);
-			if (xmlFile.load){
-				xmlFile.load("site.xml");
-				stylesheet.load("web/site.xsl");
-			} else {
-				alert("Document could not be loaded by browser.");
-			}
-			xmlFile.addEventListener("load", transform, false);
-			stylesheet.addEventListener("load", transform, false);
-		}
-		//IE 6.0+ solution
-		else if (window.ActiveXObject) {
-			xmlFile = new ActiveXObject("msxml2.DOMDocument.3.0");
-			xmlFile.async = false;
-			xmlFile.load("site.xml");
-			stylesheet = new ActiveXObject("msxml2.FreeThreadedDOMDocument.3.0");
-			stylesheet.async = false;
-			stylesheet.load("web/site.xsl");
-			cache = new ActiveXObject("msxml2.XSLTemplate.3.0");
-			cache.stylesheet = stylesheet;
-			transformData();
-		}
-	}
-	// separate transformation function for IE 6.0+
-	function transformData(){
-		var processor = cache.createProcessor();
-		processor.input = xmlFile;
-		processor.transform();
-		data.innerHTML = processor.output;
-	}
-	// separate transformation function for NSCP 7.1+ and Mozilla 1.4.1+ 
-	function transform(){
-		returnval+=1;
-		if (returnval==2){
-			var processor = new XSLTProcessor();
-			processor.importStylesheet(stylesheet); 
-			doc = processor.transformToDocument(xmlFile);
-			document.getElementById("data").innerHTML = doc.documentElement.innerHTML;
-		}
-	}
-</script>
-</head>
-<body onload="init();">
-<!--[insert static HTML here]-->
-<div id="data"><!-- this is where the transformed data goes --></div>
-</body>
-</html>
diff --git a/releng/org.eclipse.tigerstripe.update-site/site-interim.xml b/releng/org.eclipse.tigerstripe.update-site/site-interim.xml
deleted file mode 100644
index 56ba23a..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/site-interim.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-      mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/technology/tigerstripe/update-site/site-interim.xml&amp;format=xml">
-   <description url="http://download.eclipse.org/technology/tigerstripe/update-site/site-interim.xml">
-      Tigerstripe Project - Interim Update Site
-   </description>
-   <category-def name="Workbench Base" label="Workbench Base">
-      <description>
-         The base feature for Tigerstripe. It contains the Model Manager, the generation engine and the headless environment, but no UI. This is suitable to install headless Tigerstripe build servers, or to build your own components on top of Tigerstripes.
-      </description>
-   </category-def>
-   <category-def name="End-User Workbench" label="End-User Workbench">
-      <description>
-         This is the End-User Workbench Feature, including the complete MDD environment including support for modeling, diagrams, content generation, import/export, etc.
-      </description>
-   </category-def>
-   <category-def name="Generic Annotations" label="Generic Annotations">
-      <description>
-         The Generic Annotation Feature, including UI and basic integration for workspace Resources and JDT.
-      </description>
-   </category-def>
-</site>
diff --git a/releng/org.eclipse.tigerstripe.update-site/site.xml b/releng/org.eclipse.tigerstripe.update-site/site.xml
deleted file mode 100644
index 86885e6..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/site.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site
-      mirrorsURL="http://www.eclipse.org/downloads/download.php?file=/technology/tigerstripe/update-site/site.xml&amp;format=xml">
-   <description url="http://download.eclipse.org/technology/tigerstripe/update-site">
-      Tigerstripe Project - Update Site
-   </description>
-   <category-def name="Workbench Base" label="Workbench Base">
-      <description>
-         The base feature for Tigerstripe. It contains the Model Manager, the generation engine and the headless environment, but no UI. This is suitable to install headless Tigerstripe build servers, or to build your own components on top of Tigerstripes.
-      </description>
-   </category-def>
-   <category-def name="End-User Workbench" label="End-User Workbench">
-      <description>
-         This is the End-User Workbench Feature, including the complete MDD environment including support for modeling, diagrams, content generation, import/export, etc.
-      </description>
-   </category-def>
-   <category-def name="Generic Annotations" label="Generic Annotations">
-      <description>
-         The Generic Annotation Feature, including UI and basic integration for workspace Resources and JDT.
-      </description>
-   </category-def>
-</site>
diff --git a/releng/org.eclipse.tigerstripe.update-site/web/site-interim.xsl b/releng/org.eclipse.tigerstripe.update-site/web/site-interim.xsl
deleted file mode 100644
index 3130c48..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/web/site-interim.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-	<html>
-	<head>
-	<title>Tigerstripe Interim Update Site</title>
-	<style>@import url("web/site.css");</style>
-	</head>
-	<body>
-	<h1 class="title">Tigerstripe Interim Update Site</h1>
-	<p class="bodyText"><xsl:value-of select="description"/></p>
-	<table width="100%" border="0" cellspacing="1" cellpadding="2">
-	<xsl:for-each select="category-def">
-		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-	<xsl:if test="count(key('cat',@name)) != 0">
-			<tr class="header">
-				<td class="sub-header" width="30%">
-					<xsl:value-of select="@name"/>
-				</td>
-				<td class="sub-header" width="70%">
-					<xsl:value-of select="@label"/>
-				</td>
-			</tr>
-			<xsl:for-each select="key('cat',@name)">
-			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
-			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-			<tr>
-				<xsl:choose>
-				<xsl:when test="(position() mod 2 = 1)">
-					<xsl:attribute name="class">dark-row</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="class">light-row</xsl:attribute>
-				</xsl:otherwise>
-				</xsl:choose>
-				<td class="log-text" id="indent">
-						<xsl:choose>
-						<xsl:when test="ancestor::feature//@label">
-							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-							<br/>
-							<div id="indent">
-							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-							</div>
-						</xsl:when>
-						<xsl:otherwise>
-						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-						</xsl:otherwise>
-						</xsl:choose>
-						<br />
-				</td>
-				<td>
-					<table>
-						<xsl:if test="ancestor::feature//@os">
-							<tr><td class="log-text" id="indent">Operating Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@ws">
-							<tr><td class="log-text" id="indent">Windows Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@nl">
-							<tr><td class="log-text" id="indent">Languages:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@arch">
-							<tr><td class="log-text" id="indent">Architecture:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-							</tr>
-						</xsl:if>
-					</table>
-				</td>
-			</tr>
-			</xsl:for-each>
-			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-		</xsl:if>
-	</xsl:for-each>
-	<xsl:if test="count(feature)  &gt; count(feature/category)">
-	<tr class="header">
-		<td class="sub-header" colspan="2">
-		Uncategorized
-		</td>
-	</tr>
-	</xsl:if>
-	<xsl:choose>
-	<xsl:when test="function-available('msxsl:node-set')">
-	   <xsl:variable name="rtf-nodes">
-		<xsl:for-each select="feature[not(category)]">
-			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-			<xsl:sort select="@version" order="ascending" />
-			<xsl:value-of select="."/>
-			<xsl:copy-of select="." />
-		</xsl:for-each>
-	   </xsl:variable>
-	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-	<xsl:for-each select="$myNodeSet">
-	<tr>
-		<xsl:choose>
-		<xsl:when test="position() mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:when>
-	<xsl:otherwise>
-	<xsl:for-each select="feature[not(category)]">
-	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-	<xsl:sort select="@version" order="ascending" />
-	<tr>
-		<xsl:choose>
-		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:otherwise>
-	</xsl:choose>
-	</table>
-	</body>
-	</html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/releng/org.eclipse.tigerstripe.update-site/web/site.css b/releng/org.eclipse.tigerstripe.update-site/web/site.css
deleted file mode 100644
index 62c6f9f..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/web/site.css
+++ /dev/null
@@ -1,12 +0,0 @@
-<STYLE type="text/css">
-td.spacer {padding-bottom: 10px; padding-top: 10px;}
-.title { font-family: sans-serif; color: #99AACC;}
-.bodyText { font-family: sans-serif; font-size: 9pt; color:#000000;  }
-.sub-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white;}
-.log-text {font-family: sans-serif; font-style: normal; font-weight: lighter; font-size: 8pt; color:black;}
-.big-header { font-family: sans-serif; font-style: normal; font-weight: bold; font-size: 9pt; color: white; border-top:10px solid white;}
-.light-row {background:#FFFFFF}
-.dark-row {background:#EEEEFF}
-.header {background:#99AADD}
-#indent {word-wrap : break-word;width :300px;text-indent:10px;}
-</STYLE>
diff --git a/releng/org.eclipse.tigerstripe.update-site/web/site.xsl b/releng/org.eclipse.tigerstripe.update-site/web/site.xsl
deleted file mode 100644
index bfe8f15..0000000
--- a/releng/org.eclipse.tigerstripe.update-site/web/site.xsl
+++ /dev/null
@@ -1,214 +0,0 @@
-<xsl:stylesheet version = '1.0' xmlns:xsl='http://www.w3.org/1999/XSL/Transform' xmlns:msxsl="urn:schemas-microsoft-com:xslt">
-<xsl:output method="html" encoding="UTF-8"/>
-<xsl:key name="cat" match="category" use="@name"/>
-<xsl:template match="/">
-<xsl:for-each select="site">
-	<html>
-	<head>
-	<title>Tigerstripe Update Site</title>
-	<style>@import url("web/site.css");</style>
-	</head>
-	<body>
-	<h1 class="title">Tigerstripe Update Site</h1>
-	<p class="bodyText"><xsl:value-of select="description"/></p>
-	<table width="100%" border="0" cellspacing="1" cellpadding="2">
-	<xsl:for-each select="category-def">
-		<xsl:sort select="@label" order="ascending" case-order="upper-first"/>
-		<xsl:sort select="@name" order="ascending" case-order="upper-first"/>
-	<xsl:if test="count(key('cat',@name)) != 0">
-			<tr class="header">
-				<td class="sub-header" width="30%">
-					<xsl:value-of select="@name"/>
-				</td>
-				<td class="sub-header" width="70%">
-					<xsl:value-of select="@label"/>
-				</td>
-			</tr>
-			<xsl:for-each select="key('cat',@name)">
-			<xsl:sort select="ancestor::feature//@version" order="ascending"/>
-			<xsl:sort select="ancestor::feature//@id" order="ascending" case-order="upper-first"/>
-			<tr>
-				<xsl:choose>
-				<xsl:when test="(position() mod 2 = 1)">
-					<xsl:attribute name="class">dark-row</xsl:attribute>
-				</xsl:when>
-				<xsl:otherwise>
-					<xsl:attribute name="class">light-row</xsl:attribute>
-				</xsl:otherwise>
-				</xsl:choose>
-				<td class="log-text" id="indent">
-						<xsl:choose>
-						<xsl:when test="ancestor::feature//@label">
-							<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@label"/></a>
-							<br/>
-							<div id="indent">
-							(<xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/>)
-							</div>
-						</xsl:when>
-						<xsl:otherwise>
-						<a href="{ancestor::feature//@url}"><xsl:value-of select="ancestor::feature//@id"/> - <xsl:value-of select="ancestor::feature//@version"/></a>
-						</xsl:otherwise>
-						</xsl:choose>
-						<br />
-				</td>
-				<td>
-					<table>
-						<xsl:if test="ancestor::feature//@os">
-							<tr><td class="log-text" id="indent">Operating Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@os"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@ws">
-							<tr><td class="log-text" id="indent">Windows Systems:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@ws"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@nl">
-							<tr><td class="log-text" id="indent">Languages:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@nl"/></td>
-							</tr>
-						</xsl:if>
-						<xsl:if test="ancestor::feature//@arch">
-							<tr><td class="log-text" id="indent">Architecture:</td>
-							<td class="log-text" id="indent"><xsl:value-of select="ancestor::feature//@arch"/></td>
-							</tr>
-						</xsl:if>
-					</table>
-				</td>
-			</tr>
-			</xsl:for-each>
-			<tr><td class="spacer"><br/></td><td class="spacer"><br/></td></tr>
-		</xsl:if>
-	</xsl:for-each>
-	<xsl:if test="count(feature)  &gt; count(feature/category)">
-	<tr class="header">
-		<td class="sub-header" colspan="2">
-		Uncategorized
-		</td>
-	</tr>
-	</xsl:if>
-	<xsl:choose>
-	<xsl:when test="function-available('msxsl:node-set')">
-	   <xsl:variable name="rtf-nodes">
-		<xsl:for-each select="feature[not(category)]">
-			<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-			<xsl:sort select="@version" order="ascending" />
-			<xsl:value-of select="."/>
-			<xsl:copy-of select="." />
-		</xsl:for-each>
-	   </xsl:variable>
-	   <xsl:variable name="myNodeSet" select="msxsl:node-set($rtf-nodes)/*"/>
-	<xsl:for-each select="$myNodeSet">
-	<tr>
-		<xsl:choose>
-		<xsl:when test="position() mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:when>
-	<xsl:otherwise>
-	<xsl:for-each select="feature[not(category)]">
-	<xsl:sort select="@id" order="ascending" case-order="upper-first"/>
-	<xsl:sort select="@version" order="ascending" />
-	<tr>
-		<xsl:choose>
-		<xsl:when test="count(preceding-sibling::feature[not(category)]) mod 2 = 1">
-		<xsl:attribute name="class">dark-row</xsl:attribute>
-		</xsl:when>
-		<xsl:otherwise>
-		<xsl:attribute name="class">light-row</xsl:attribute>
-		</xsl:otherwise>
-		</xsl:choose>
-		<td class="log-text" id="indent">
-			<xsl:choose>
-			<xsl:when test="@label">
-				<a href="{@url}"><xsl:value-of select="@label"/></a>
-				<br />
-				<div id="indent">
-				(<xsl:value-of select="@id"/> - <xsl:value-of select="@version"/>)
-				</div>
-			</xsl:when>
-			<xsl:otherwise>
-				<a href="{@url}"><xsl:value-of select="@id"/> - <xsl:value-of select="@version"/></a>
-			</xsl:otherwise>
-			</xsl:choose>
-			<br /><br />
-		</td>
-		<td>
-			<table>
-				<xsl:if test="@os">
-					<tr><td class="log-text" id="indent">Operating Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@os"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@ws">
-					<tr><td class="log-text" id="indent">Windows Systems:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@ws"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@nl">
-					<tr><td class="log-text" id="indent">Languages:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@nl"/></td>
-					</tr>
-				</xsl:if>
-				<xsl:if test="@arch">
-					<tr><td class="log-text" id="indent">Architecture:</td>
-					<td class="log-text" id="indent"><xsl:value-of select="@arch"/></td>
-					</tr>
-				</xsl:if>
-			</table>
-		</td>
-	</tr>
-	</xsl:for-each>
-	</xsl:otherwise>
-	</xsl:choose>
-	</table>
-	</body>
-	</html>
-</xsl:for-each>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/samples/EclipseSummit08/ClassLevel-Generator/.classpath b/samples/EclipseSummit08/ClassLevel-Generator/.classpath
deleted file mode 100644
index da6a272..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/.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/samples/EclipseSummit08/ClassLevel-Generator/.cvsignore b/samples/EclipseSummit08/ClassLevel-Generator/.cvsignore
deleted file mode 100644
index 90b07e9..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-classes
diff --git a/samples/EclipseSummit08/ClassLevel-Generator/.project b/samples/EclipseSummit08/ClassLevel-Generator/.project
deleted file mode 100644
index a36abdd..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>ClassLevel-Generator</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/samples/EclipseSummit08/ClassLevel-Generator/src/org/eclipse/tigerstripe/sample/Helper.java b/samples/EclipseSummit08/ClassLevel-Generator/src/org/eclipse/tigerstripe/sample/Helper.java
deleted file mode 100644
index b332fb1..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/src/org/eclipse/tigerstripe/sample/Helper.java
+++ /dev/null
@@ -1,13 +0,0 @@
-package org.eclipse.tigerstripe.sample;
-
-public class Helper {
-
-	public String capitalize(String str) {
-		if (str == null || str.length() == 0) {
-			return str;
-		} else {
-			return str.substring(0, 1).toUpperCase()
-					+ str.substring(1, str.length());
-		}
-	}
-}
diff --git a/samples/EclipseSummit08/ClassLevel-Generator/templates/catalog.vm b/samples/EclipseSummit08/ClassLevel-Generator/templates/catalog.vm
deleted file mode 100644
index c37fa0a..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/templates/catalog.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-#foreach( $artifact in $allArtifacts )
-$artifact.FullyQualifiedName
-#end
diff --git a/samples/EclipseSummit08/ClassLevel-Generator/templates/dummyPojo.vm b/samples/EclipseSummit08/ClassLevel-Generator/templates/dummyPojo.vm
deleted file mode 100644
index 2f20935..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/templates/dummyPojo.vm
+++ /dev/null
@@ -1,17 +0,0 @@
-package $artifact.Package;
-
-public class $artifact.FullyQualifiedName 
-#if ($artifact.hasExtends())
-extends $artifact.Extends.FullyQualifiedName
-#end
-{
-
-#foreach( $field in $artifact.Fields )
-	private $field.Type.FullyQualifiedName $field.getName();
-	
-	public $field.Type.FullyQualifiedName get$helper.capitalize($field.getName())() {
-		return this.$field.getName();
-	}
-#end
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/ClassLevel-Generator/ts-plugin.xml b/samples/EclipseSummit08/ClassLevel-Generator/ts-plugin.xml
deleted file mode 100644
index 211a2fb..0000000
--- a/samples/EclipseSummit08/ClassLevel-Generator/ts-plugin.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ts_plugin version="1.2">
-<project name="ClassLevel-Generator">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>1.0</version>
-<description>Sample generator with 2 simples rules.</description>
-<provider>Cisco Systems, Inc.</provider>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="0" isEnabled="false" logPath="ClassLevel-Generator.log" maxRoll="9"/>
-<globalProperties/>
-<globalRules>
-<rule description="Creates a single file that contains a list of all the artifacts in scope." enabled="true" name="createCatalog" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<body outputFile="catalog.txt" overwriteFiles="true" suppressFiles="true" template="templates/catalog.vm"/>
-</rule>
-</globalRules>
-<artifactRules>
-<rule description="Creates a simplistic pojo-like definition &#13;for all entities in the project." enabled="true" name="createDummyPojo" type="org.eclipse.tigerstripe.workbench.plugins.IArtifactBasedTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.sample.Helper" entry="helper"/>
-<body artifactFilterClass="" artifactType="org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact" includeDependencies="false" modelClass="" modelClassName="wrapper" outputFile="${artifact.Path}/${artifact.Name}.java" overwriteFiles="true" suppressFiles="true" template="templates/dummyPojo.vm"/>
-</rule>
-</artifactRules>
-<classpathEntries/>
-<additionalFiles/>
-<advanced/>
-<annotationPlugins/>
-</ts_plugin>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/.classpath b/samples/EclipseSummit08/EclipseSummit08_annotations/.classpath
deleted file mode 100644
index 304e861..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/.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/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/.project b/samples/EclipseSummit08/EclipseSummit08_annotations/.project
deleted file mode 100644
index ca2efd6..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>EclipseSummit08_annotations</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.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/META-INF/MANIFEST.MF b/samples/EclipseSummit08/EclipseSummit08_annotations/META-INF/MANIFEST.MF
deleted file mode 100644
index 12adf1d..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,25 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tigerstripe.samples.EclipseSummit08_annotations;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes,
- org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl,
- org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.util,
- org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation,
- org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl,
- org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.util
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.tigerstripe.annotation.core,
- org.eclipse.ui.workbench,
- org.eclipse.jface,
- org.eclipse.tigerstripe.annotation.ui,
- org.eclipse.wst.html.ui,
- org.eclipse.tigerstripe.workbench.ui.base
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.tigerstripe.samples.eclipseSummit08.Activator
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/build.properties b/samples/EclipseSummit08/EclipseSummit08_annotations/build.properties
deleted file mode 100644
index 4e06c90..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/build.properties
+++ /dev/null
@@ -1,14 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.1 2008/11/05 19:53:22 edillon Exp $
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-gs.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-gs.png
deleted file mode 100644
index 4f0cc68..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-gs.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-new-gs.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-new-gs.png
deleted file mode 100644
index 2d8a578..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-new-gs.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-new.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-new.png
deleted file mode 100644
index 0503799..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube-new.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube.png
deleted file mode 100644
index e3d894f..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/cube.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/designNote.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/designNote.png
deleted file mode 100644
index 188e1c1..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/designNote.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/documentation.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/documentation.png
deleted file mode 100644
index 53014ab..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/documentation.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/pencil.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/pencil.png
deleted file mode 100644
index ae6ced0..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/pencil.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/todo.png b/samples/EclipseSummit08/EclipseSummit08_annotations/icons/todo.png
deleted file mode 100644
index 529bb7f..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/icons/todo.png
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/model/designNotes.ecore b/samples/EclipseSummit08/EclipseSummit08_annotations/model/designNotes.ecore
deleted file mode 100644
index 130931e..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/model/designNotes.ecore
+++ /dev/null
@@ -1,18 +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="designNotes"
-    nsURI="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-    nsPrefix="dn">
-  <eClassifiers xsi:type="ecore:EClass" name="Note">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="Text" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="org.eclipse.tigerstripe.annotation" references="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-        <details key="multiline" value="true"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="TODO">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="hack" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/model/designNotes.genmodel b/samples/EclipseSummit08/EclipseSummit08_annotations/model/designNotes.genmodel
deleted file mode 100644
index a21d5f8..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/model/designNotes.genmodel
+++ /dev/null
@@ -1,18 +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="/EclipseSummit08_annotations/src"
-    modelPluginID="EclipseSummit08_annotations" modelName="DesignNotes" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false">
-  <foreignModel>designNotes.ecore</foreignModel>
-  <genPackages prefix="DesignNotes" basePackage="org.eclipse.tigerstripe.samples.eclipseSummit08.annotations"
-      disposableProviderFactory="true" ecorePackage="designNotes.ecore#/">
-    <genClasses ecoreClass="designNotes.ecore#//Note">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute designNotes.ecore#//Note/Text"/>
-    </genClasses>
-    <genClasses ecoreClass="designNotes.ecore#//TODO">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute designNotes.ecore#//TODO/hack"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute designNotes.ecore#//TODO/summary"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/model/documentation.ecore b/samples/EclipseSummit08/EclipseSummit08_annotations/model/documentation.ecore
deleted file mode 100644
index e15cbb8..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/model/documentation.ecore
+++ /dev/null
@@ -1,15 +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="documentation"
-    nsURI="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore"
-    nsPrefix="d">
-  <eClassifiers xsi:type="ecore:EClass" name="Documentation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="author" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="content" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString">
-      <eAnnotations source="org.eclipse.tigerstripe.annotation" references="http://www.eclipse.org/emf/2002/Ecore#//EStructuralFeature">
-        <details key="editor" value="org.eclipse.wst.html.core.htmlsource.source"/>
-      </eAnnotations>
-    </eStructuralFeatures>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/model/documentation.genmodel b/samples/EclipseSummit08/EclipseSummit08_annotations/model/documentation.genmodel
deleted file mode 100644
index 5f5ca6d..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/model/documentation.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="/EclipseSummit08_annotations/src"
-    modelPluginID="EclipseSummit08_annotations" modelName="Documentation" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false">
-  <foreignModel>documentation.ecore</foreignModel>
-  <genPackages prefix="Documentation" basePackage="org.eclipse.tigerstripe.samples.eclipseSummit08.annotations"
-      disposableProviderFactory="true" ecorePackage="documentation.ecore#/">
-    <genClasses ecoreClass="documentation.ecore#//Documentation">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute documentation.ecore#//Documentation/author"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute documentation.ecore#//Documentation/content"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/patterns/documentedEntity.xml b/samples/EclipseSummit08/EclipseSummit08_annotations/patterns/documentedEntity.xml
deleted file mode 100644
index 9e48e20..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/patterns/documentedEntity.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<pattern:creationPattern
-	patternName="org.eclipse.tigerstripe.samples.eclipseSummit08.DocumentedEntity"
-	uiLabel="Documented Entity" iconPath="icons/cube-new.png" disabledIconPath="icons/cube-new-gs.png"
-	patternType="node" index="100"
-	xmlns:pattern="http://org.eclipse.tigerstripe/xml/tigerstripeCreationPattern/v1-0"
-	xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0">
-	<pattern:description>Create a new Documented Entity
-	</pattern:description>
-
-	<ts:artifact name="_user1"
-		artifactType="org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact">
-		<ts:annotations>
-  		 <![CDATA[
-           <xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:d="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore">
-             <d:Documentation author="" content=""/>
-           </xmi:XMI>
-  		 ]]>   
-        </ts:annotations>
-		<ts:comment>New Documented Entity</ts:comment>
-	</ts:artifact>
-</pattern:creationPattern>
\ No newline at end of file
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/plugin.properties b/samples/EclipseSummit08/EclipseSummit08_annotations/plugin.properties
deleted file mode 100644
index d3065f3..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/plugin.properties
+++ /dev/null
@@ -1,8 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.1 2008/11/05 19:53:22 edillon Exp $
-
-pluginName = DesignNotes Model
-providerName = www.example.org
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/plugin.xml b/samples/EclipseSummit08/EclipseSummit08_annotations/plugin.xml
deleted file mode 100644
index 4178b9d..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/plugin.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id: plugin.xml,v 1.3 2008/11/06 22:56:05 edillon Exp $
--->
-
-<plugin>
-
-   <extension
-         point="org.eclipse.tigerstripe.workbench.base.customArtifactAuditor">
-      <customAuditRule
-            auditorClass="org.eclipse.tigerstripe.samples.eclipseSummit08.audit.DocumentedEntityAuditor"
-            name="Valid documentation">
-      </customAuditRule>
-   </extension>
-
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-            class="org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage"
-            genModel="model/designNotes.genmodel"/>
-   </extension>
-   <extension point="org.eclipse.emf.ecore.generated_package">
-      <package
-            uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore"
-            class="org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationPackage"
-            genModel="model/documentation.genmodel"/>
-   </extension>
-
-	<extension
-	     point="org.eclipse.tigerstripe.annotation.core.packageLabel">
-	   <label
-	       epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore"
-	       name="EclipseSummit08"/>
-	 </extension>
-
-	<extension
-	     point="org.eclipse.tigerstripe.annotation.core.packageLabel">
-	   <label
-	       epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-	       name="EclipseSummit08"/>
-	 </extension>
-
-   <extension
-         point="org.eclipse.tigerstripe.annotation.core.annotationType">
-      <definition
-            description="Documentation content"
-            eclass="Documentation"
-            epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore"
-            name="Documentation">
-         <target
-               type="org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent"
-               unique="true">
-         </target>
-      </definition>
-   </extension>
-
-   <extension
-         point="org.eclipse.tigerstripe.annotation.core.annotationType">
-      <definition
-            description="Design Notes"
-            eclass="Note"
-            epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-            name="Design Notes">
-         <target
-               type="org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent"
-               unique="false">
-         </target>
-      </definition>
-   </extension>
-   
-   <extension
-         point="org.eclipse.tigerstripe.annotation.core.annotationType">
-      <definition
-            description="TODO Notes"
-            eclass="TODO"
-            epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-            name="TODO">
-         <target
-               type="org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent"
-               unique="false">
-         </target>
-      </definition>
-   </extension>
-
-	<extension point="org.eclipse.tigerstripe.annotation.ui.annotationLabelProvider">
-	    <provider
-	          class="org.eclipse.tigerstripe.samples.eclipseSummit08.ui.LabelProvider"
-	          epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-	          eclass="TODO"/>
-	</extension>
-	<extension point="org.eclipse.tigerstripe.annotation.ui.annotationLabelProvider">
-	    <provider
-	          class="org.eclipse.tigerstripe.samples.eclipseSummit08.ui.LabelProvider"
-	          epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"
-	          eclass="Note"/>
-	</extension>
-	<extension point="org.eclipse.tigerstripe.annotation.ui.annotationLabelProvider">
-	    <provider
-	          class="org.eclipse.tigerstripe.samples.eclipseSummit08.ui.LabelProvider"
-	          epackage-uri="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore"
-	          eclass="Documentation"/>
-	 </extension>
-
-   <extension
-         point="org.eclipse.tigerstripe.workbench.ui.base.labelDecorator">
-      <decorator
-            class="org.eclipse.tigerstripe.samples.eclipseSummit08.ui.DocumentedLabelDecorator">
-      </decorator>
-   </extension>
-
-	<extension
-         point="org.eclipse.tigerstripe.metamodel.customArtifactMetadata">
-      <modelComponentIconProvider
-            artifactType="IManagedEntityArtifact"
-            provider="org.eclipse.tigerstripe.samples.eclipseSummit08.ui.IconProvider">
-      </modelComponentIconProvider>
-   </extension>
-	
-   <extension
-         point="org.eclipse.tigerstripe.workbench.base.creationPatterns">
-      <patternDefinition
-            patternFile="patterns/documentedEntity.xml">
-      </patternDefinition>
-      <disabledPattern
-            patternName="org.eclipse.tigerstripe.workbench.base.ManagedEntity">
-      </disabledPattern>
-      <disabledPattern
-            patternName="org.eclipse.tigerstripe.workbench.base.Query">
-      </disabledPattern>
-      <disabledPattern
-            patternName="org.eclipse.tigerstripe.workbench.base.Session">
-      </disabledPattern>
-      <disabledPattern
-            patternName="org.eclipse.tigerstripe.workbench.base.UpdateProcedure">
-      </disabledPattern>
-      <disabledPattern
-            patternName="org.eclipse.tigerstripe.workbench.base.Event">
-      </disabledPattern>
-      <disabledPattern
-            patternName="org.eclipse.tigerstripe.workbench.base.Exception">
-      </disabledPattern>
-	</extension>
-	
-</plugin>
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/Activator.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/Activator.java
deleted file mode 100644
index bc4aaf6..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/Activator.java
+++ /dev/null
@@ -1,55 +0,0 @@
-package org.eclipse.tigerstripe.samples.eclipseSummit08;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tigerstripe.samples.EclipseSummit08_annotations";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#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 Activator getDefault() {
-		return plugin;
-	}
-	
-	public static ImageDescriptor createImage(String imageFilePath) {
-		return imageDescriptorFromPlugin(PLUGIN_ID, imageFilePath);
-	}
-
-}
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/DesignNotesFactory.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/DesignNotesFactory.java
deleted file mode 100644
index b9fbd0c..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/DesignNotesFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DesignNotesFactory.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes;
-
-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.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage
- * @generated
- */
-public interface DesignNotesFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	DesignNotesFactory eINSTANCE = org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.DesignNotesFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Note</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Note</em>'.
-	 * @generated
-	 */
-	Note createNote();
-
-	/**
-	 * Returns a new object of class '<em>TODO</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>TODO</em>'.
-	 * @generated
-	 */
-	TODO createTODO();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	DesignNotesPackage getDesignNotesPackage();
-
-} //DesignNotesFactory
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/DesignNotesPackage.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/DesignNotesPackage.java
deleted file mode 100644
index 79c595a..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/DesignNotesPackage.java
+++ /dev/null
@@ -1,248 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DesignNotesPackage.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes;
-
-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.samples.eclipseSummit08.annotations.designNotes.DesignNotesFactory
- * @model kind="package"
- * @generated
- */
-public interface DesignNotesPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "designNotes";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "dn";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	DesignNotesPackage eINSTANCE = org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.DesignNotesPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.NoteImpl <em>Note</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.NoteImpl
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.DesignNotesPackageImpl#getNote()
-	 * @generated
-	 */
-	int NOTE = 0;
-
-	/**
-	 * The feature id for the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOTE__TEXT = 0;
-
-	/**
-	 * The number of structural features of the '<em>Note</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int NOTE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.TODOImpl <em>TODO</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.TODOImpl
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.DesignNotesPackageImpl#getTODO()
-	 * @generated
-	 */
-	int TODO = 1;
-
-	/**
-	 * The feature id for the '<em><b>Hack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TODO__HACK = 0;
-
-	/**
-	 * The feature id for the '<em><b>Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TODO__SUMMARY = 1;
-
-	/**
-	 * The number of structural features of the '<em>TODO</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int TODO_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note <em>Note</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Note</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note
-	 * @generated
-	 */
-	EClass getNote();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note#getText <em>Text</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Text</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note#getText()
-	 * @see #getNote()
-	 * @generated
-	 */
-	EAttribute getNote_Text();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO <em>TODO</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>TODO</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO
-	 * @generated
-	 */
-	EClass getTODO();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#isHack <em>Hack</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Hack</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#isHack()
-	 * @see #getTODO()
-	 * @generated
-	 */
-	EAttribute getTODO_Hack();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#getSummary <em>Summary</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Summary</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#getSummary()
-	 * @see #getTODO()
-	 * @generated
-	 */
-	EAttribute getTODO_Summary();
-
-	/**
-	 * 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
-	 */
-	DesignNotesFactory getDesignNotesFactory();
-
-	/**
-	 * <!-- 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.samples.eclipseSummit08.annotations.designNotes.impl.NoteImpl <em>Note</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.NoteImpl
-		 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.DesignNotesPackageImpl#getNote()
-		 * @generated
-		 */
-		EClass NOTE = eINSTANCE.getNote();
-
-		/**
-		 * The meta object literal for the '<em><b>Text</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute NOTE__TEXT = eINSTANCE.getNote_Text();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.TODOImpl <em>TODO</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.TODOImpl
-		 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.DesignNotesPackageImpl#getTODO()
-		 * @generated
-		 */
-		EClass TODO = eINSTANCE.getTODO();
-
-		/**
-		 * The meta object literal for the '<em><b>Hack</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TODO__HACK = eINSTANCE.getTODO_Hack();
-
-		/**
-		 * The meta object literal for the '<em><b>Summary</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute TODO__SUMMARY = eINSTANCE.getTODO_Summary();
-
-	}
-
-} //DesignNotesPackage
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/Note.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/Note.java
deleted file mode 100644
index 566843c..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/Note.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Note.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Note</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage#getNote()
- * @model
- * @generated
- */
-public interface Note extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Text</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Text</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Text</em>' attribute.
-	 * @see #setText(String)
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage#getNote_Text()
-	 * @model annotation="org.eclipse.tigerstripe.annotation multiline='true'"
-	 * @generated
-	 */
-	String getText();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note#getText <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Text</em>' attribute.
-	 * @see #getText()
-	 * @generated
-	 */
-	void setText(String value);
-
-} // Note
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/TODO.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/TODO.java
deleted file mode 100644
index 4a446f9..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/TODO.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TODO.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>TODO</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#isHack <em>Hack</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#getSummary <em>Summary</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage#getTODO()
- * @model
- * @generated
- */
-public interface TODO extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Hack</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Hack</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Hack</em>' attribute.
-	 * @see #setHack(boolean)
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage#getTODO_Hack()
-	 * @model
-	 * @generated
-	 */
-	boolean isHack();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#isHack <em>Hack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Hack</em>' attribute.
-	 * @see #isHack()
-	 * @generated
-	 */
-	void setHack(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Summary</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Summary</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Summary</em>' attribute.
-	 * @see #setSummary(String)
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage#getTODO_Summary()
-	 * @model
-	 * @generated
-	 */
-	String getSummary();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO#getSummary <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Summary</em>' attribute.
-	 * @see #getSummary()
-	 * @generated
-	 */
-	void setSummary(String value);
-
-} // TODO
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/DesignNotesFactoryImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/DesignNotesFactoryImpl.java
deleted file mode 100644
index acf8972..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/DesignNotesFactoryImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DesignNotesFactoryImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.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.samples.eclipseSummit08.annotations.designNotes.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DesignNotesFactoryImpl extends EFactoryImpl implements DesignNotesFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DesignNotesFactory init() {
-		try {
-			DesignNotesFactory theDesignNotesFactory = (DesignNotesFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore"); 
-			if (theDesignNotesFactory != null) {
-				return theDesignNotesFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new DesignNotesFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignNotesFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DesignNotesPackage.NOTE: return createNote();
-			case DesignNotesPackage.TODO: return createTODO();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Note createNote() {
-		NoteImpl note = new NoteImpl();
-		return note;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public TODO createTODO() {
-		TODOImpl todo = new TODOImpl();
-		return todo;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignNotesPackage getDesignNotesPackage() {
-		return (DesignNotesPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static DesignNotesPackage getPackage() {
-		return DesignNotesPackage.eINSTANCE;
-	}
-
-} //DesignNotesFactoryImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/DesignNotesPackageImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/DesignNotesPackageImpl.java
deleted file mode 100644
index 090d99e..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/DesignNotesPackageImpl.java
+++ /dev/null
@@ -1,250 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DesignNotesPackageImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.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.samples.eclipseSummit08.annotations.designNotes.DesignNotesFactory;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DesignNotesPackageImpl extends EPackageImpl implements DesignNotesPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass noteEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass todoEClass = 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.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private DesignNotesPackageImpl() {
-		super(eNS_URI, DesignNotesFactory.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 DesignNotesPackage init() {
-		if (isInited) return (DesignNotesPackage)EPackage.Registry.INSTANCE.getEPackage(DesignNotesPackage.eNS_URI);
-
-		// Obtain or create and register package
-		DesignNotesPackageImpl theDesignNotesPackage = (DesignNotesPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DesignNotesPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DesignNotesPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theDesignNotesPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theDesignNotesPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theDesignNotesPackage.freeze();
-
-		return theDesignNotesPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getNote() {
-		return noteEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getNote_Text() {
-		return (EAttribute)noteEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getTODO() {
-		return todoEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTODO_Hack() {
-		return (EAttribute)todoEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getTODO_Summary() {
-		return (EAttribute)todoEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignNotesFactory getDesignNotesFactory() {
-		return (DesignNotesFactory)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
-		noteEClass = createEClass(NOTE);
-		createEAttribute(noteEClass, NOTE__TEXT);
-
-		todoEClass = createEClass(TODO);
-		createEAttribute(todoEClass, TODO__HACK);
-		createEAttribute(todoEClass, TODO__SUMMARY);
-	}
-
-	/**
-	 * <!-- 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(noteEClass, Note.class, "Note", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getNote_Text(), ecorePackage.getEString(), "Text", null, 0, 1, Note.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(todoEClass, org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO.class, "TODO", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getTODO_Hack(), ecorePackage.getEBoolean(), "hack", null, 0, 1, org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getTODO_Summary(), ecorePackage.getEString(), "summary", null, 0, 1, org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// org.eclipse.tigerstripe.annotation
-		createOrgAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>org.eclipse.tigerstripe.annotation</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createOrgAnnotations() {
-		String source = "org.eclipse.tigerstripe.annotation";		
-		addAnnotation
-		  (getNote_Text(), 
-		   source, 
-		   new String[] {
-			 "multiline", "true"
-		   });
-	}
-
-} //DesignNotesPackageImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/NoteImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/NoteImpl.java
deleted file mode 100644
index ba3d644..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/NoteImpl.java
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: NoteImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.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.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Note</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.NoteImpl#getText <em>Text</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class NoteImpl extends EObjectImpl implements Note {
-	/**
-	 * The default value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String TEXT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getText() <em>Text</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getText()
-	 * @generated
-	 * @ordered
-	 */
-	protected String text = TEXT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected NoteImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DesignNotesPackage.Literals.NOTE;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getText() {
-		return text;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setText(String newText) {
-		String oldText = text;
-		text = newText;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DesignNotesPackage.NOTE__TEXT, oldText, text));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DesignNotesPackage.NOTE__TEXT:
-				return getText();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DesignNotesPackage.NOTE__TEXT:
-				setText((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DesignNotesPackage.NOTE__TEXT:
-				setText(TEXT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DesignNotesPackage.NOTE__TEXT:
-				return TEXT_EDEFAULT == null ? text != null : !TEXT_EDEFAULT.equals(text);
-		}
-		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(" (Text: ");
-		result.append(text);
-		result.append(')');
-		return result.toString();
-	}
-
-} //NoteImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/TODOImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/TODOImpl.java
deleted file mode 100644
index d650cea..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/impl/TODOImpl.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: TODOImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.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.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>TODO</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.TODOImpl#isHack <em>Hack</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.impl.TODOImpl#getSummary <em>Summary</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class TODOImpl extends EObjectImpl implements TODO {
-	/**
-	 * The default value of the '{@link #isHack() <em>Hack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHack()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final boolean HACK_EDEFAULT = false;
-
-	/**
-	 * The cached value of the '{@link #isHack() <em>Hack</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isHack()
-	 * @generated
-	 * @ordered
-	 */
-	protected boolean hack = HACK_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getSummary() <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSummary()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String SUMMARY_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getSummary() <em>Summary</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getSummary()
-	 * @generated
-	 * @ordered
-	 */
-	protected String summary = SUMMARY_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected TODOImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DesignNotesPackage.Literals.TODO;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public boolean isHack() {
-		return hack;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setHack(boolean newHack) {
-		boolean oldHack = hack;
-		hack = newHack;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DesignNotesPackage.TODO__HACK, oldHack, hack));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getSummary() {
-		return summary;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setSummary(String newSummary) {
-		String oldSummary = summary;
-		summary = newSummary;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DesignNotesPackage.TODO__SUMMARY, oldSummary, summary));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DesignNotesPackage.TODO__HACK:
-				return isHack() ? Boolean.TRUE : Boolean.FALSE;
-			case DesignNotesPackage.TODO__SUMMARY:
-				return getSummary();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DesignNotesPackage.TODO__HACK:
-				setHack(((Boolean)newValue).booleanValue());
-				return;
-			case DesignNotesPackage.TODO__SUMMARY:
-				setSummary((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DesignNotesPackage.TODO__HACK:
-				setHack(HACK_EDEFAULT);
-				return;
-			case DesignNotesPackage.TODO__SUMMARY:
-				setSummary(SUMMARY_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DesignNotesPackage.TODO__HACK:
-				return hack != HACK_EDEFAULT;
-			case DesignNotesPackage.TODO__SUMMARY:
-				return SUMMARY_EDEFAULT == null ? summary != null : !SUMMARY_EDEFAULT.equals(summary);
-		}
-		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(" (hack: ");
-		result.append(hack);
-		result.append(", summary: ");
-		result.append(summary);
-		result.append(')');
-		return result.toString();
-	}
-
-} //TODOImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/util/DesignNotesAdapterFactory.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/util/DesignNotesAdapterFactory.java
deleted file mode 100644
index 35ddfed..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/util/DesignNotesAdapterFactory.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DesignNotesAdapterFactory.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.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.samples.eclipseSummit08.annotations.designNotes.*;
-
-/**
- * <!-- 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.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage
- * @generated
- */
-public class DesignNotesAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static DesignNotesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignNotesAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = DesignNotesPackage.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 that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DesignNotesSwitch<Adapter> modelSwitch =
-		new DesignNotesSwitch<Adapter>() {
-			@Override
-			public Adapter caseNote(Note object) {
-				return createNoteAdapter();
-			}
-			@Override
-			public Adapter caseTODO(TODO object) {
-				return createTODOAdapter();
-			}
-			@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.samples.eclipseSummit08.annotations.designNotes.Note <em>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.samples.eclipseSummit08.annotations.designNotes.Note
-	 * @generated
-	 */
-	public Adapter createNoteAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO <em>TODO</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.samples.eclipseSummit08.annotations.designNotes.TODO
-	 * @generated
-	 */
-	public Adapter createTODOAdapter() {
-		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;
-	}
-
-} //DesignNotesAdapterFactory
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/util/DesignNotesSwitch.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/util/DesignNotesSwitch.java
deleted file mode 100644
index e29dd03..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes/util/DesignNotesSwitch.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DesignNotesSwitch.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.*;
-
-/**
- * <!-- 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.samples.eclipseSummit08.annotations.designNotes.DesignNotesPackage
- * @generated
- */
-public class DesignNotesSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static DesignNotesPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DesignNotesSwitch() {
-		if (modelPackage == null) {
-			modelPackage = DesignNotesPackage.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 DesignNotesPackage.NOTE: {
-				Note note = (Note)theEObject;
-				T result = caseNote(note);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case DesignNotesPackage.TODO: {
-				TODO todo = (TODO)theEObject;
-				T result = caseTODO(todo);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>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>Note</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseNote(Note object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>TODO</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>TODO</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseTODO(TODO 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;
-	}
-
-} //DesignNotesSwitch
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/Documentation.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/Documentation.java
deleted file mode 100644
index 3ae6fed..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/Documentation.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Documentation.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Documentation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getContent <em>Content</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationPackage#getDocumentation()
- * @model
- * @generated
- */
-public interface Documentation extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Author</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Author</em>' attribute.
-	 * @see #setAuthor(String)
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationPackage#getDocumentation_Author()
-	 * @model
-	 * @generated
-	 */
-	String getAuthor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getAuthor <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Author</em>' attribute.
-	 * @see #getAuthor()
-	 * @generated
-	 */
-	void setAuthor(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Content</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Content</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Content</em>' attribute.
-	 * @see #setContent(String)
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationPackage#getDocumentation_Content()
-	 * @model annotation="org.eclipse.tigerstripe.annotation editor='org.eclipse.wst.html.core.htmlsource.source'"
-	 * @generated
-	 */
-	String getContent();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getContent <em>Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Content</em>' attribute.
-	 * @see #getContent()
-	 * @generated
-	 */
-	void setContent(String value);
-
-} // Documentation
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/DocumentationFactory.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/DocumentationFactory.java
deleted file mode 100644
index ea1fa07..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/DocumentationFactory.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationFactory.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation;
-
-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.samples.eclipseSummit08.annotations.documentation.DocumentationPackage
- * @generated
- */
-public interface DocumentationFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	DocumentationFactory eINSTANCE = org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Documentation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Documentation</em>'.
-	 * @generated
-	 */
-	Documentation createDocumentation();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	DocumentationPackage getDocumentationPackage();
-
-} //DocumentationFactory
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/DocumentationPackage.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/DocumentationPackage.java
deleted file mode 100644
index a037e44..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/DocumentationPackage.java
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationPackage.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation;
-
-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.samples.eclipseSummit08.annotations.documentation.DocumentationFactory
- * @model kind="package"
- * @generated
- */
-public interface DocumentationPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "documentation";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "d";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	DocumentationPackage eINSTANCE = org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationImpl <em>Documentation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationImpl
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationPackageImpl#getDocumentation()
-	 * @generated
-	 */
-	int DOCUMENTATION = 0;
-
-	/**
-	 * The feature id for the '<em><b>Author</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__AUTHOR = 0;
-
-	/**
-	 * The feature id for the '<em><b>Content</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION__CONTENT = 1;
-
-	/**
-	 * The number of structural features of the '<em>Documentation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int DOCUMENTATION_FEATURE_COUNT = 2;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation <em>Documentation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Documentation</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation
-	 * @generated
-	 */
-	EClass getDocumentation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getAuthor <em>Author</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Author</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getAuthor()
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	EAttribute getDocumentation_Author();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getContent <em>Content</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Content</em>'.
-	 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation#getContent()
-	 * @see #getDocumentation()
-	 * @generated
-	 */
-	EAttribute getDocumentation_Content();
-
-	/**
-	 * 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
-	 */
-	DocumentationFactory getDocumentationFactory();
-
-	/**
-	 * <!-- 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.samples.eclipseSummit08.annotations.documentation.impl.DocumentationImpl <em>Documentation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationImpl
-		 * @see org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationPackageImpl#getDocumentation()
-		 * @generated
-		 */
-		EClass DOCUMENTATION = eINSTANCE.getDocumentation();
-
-		/**
-		 * The meta object literal for the '<em><b>Author</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DOCUMENTATION__AUTHOR = eINSTANCE.getDocumentation_Author();
-
-		/**
-		 * The meta object literal for the '<em><b>Content</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute DOCUMENTATION__CONTENT = eINSTANCE.getDocumentation_Content();
-
-	}
-
-} //DocumentationPackage
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationFactoryImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationFactoryImpl.java
deleted file mode 100644
index d505740..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationFactoryImpl.java
+++ /dev/null
@@ -1,99 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationFactoryImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.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.samples.eclipseSummit08.annotations.documentation.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DocumentationFactoryImpl extends EFactoryImpl implements DocumentationFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static DocumentationFactory init() {
-		try {
-			DocumentationFactory theDocumentationFactory = (DocumentationFactory)EPackage.Registry.INSTANCE.getEFactory("http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore"); 
-			if (theDocumentationFactory != null) {
-				return theDocumentationFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new DocumentationFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentationFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case DocumentationPackage.DOCUMENTATION: return createDocumentation();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Documentation createDocumentation() {
-		DocumentationImpl documentation = new DocumentationImpl();
-		return documentation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentationPackage getDocumentationPackage() {
-		return (DocumentationPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static DocumentationPackage getPackage() {
-		return DocumentationPackage.eINSTANCE;
-	}
-
-} //DocumentationFactoryImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationImpl.java
deleted file mode 100644
index 130f614..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationImpl.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.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.samples.eclipseSummit08.annotations.documentation.Documentation;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Documentation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationImpl#getAuthor <em>Author</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.impl.DocumentationImpl#getContent <em>Content</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class DocumentationImpl extends EObjectImpl implements Documentation {
-	/**
-	 * The default value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String AUTHOR_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getAuthor() <em>Author</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAuthor()
-	 * @generated
-	 * @ordered
-	 */
-	protected String author = AUTHOR_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getContent() <em>Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContent()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String CONTENT_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getContent() <em>Content</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getContent()
-	 * @generated
-	 * @ordered
-	 */
-	protected String content = CONTENT_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return DocumentationPackage.Literals.DOCUMENTATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAuthor() {
-		return author;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAuthor(String newAuthor) {
-		String oldAuthor = author;
-		author = newAuthor;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.DOCUMENTATION__AUTHOR, oldAuthor, author));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getContent() {
-		return content;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setContent(String newContent) {
-		String oldContent = content;
-		content = newContent;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, DocumentationPackage.DOCUMENTATION__CONTENT, oldContent, content));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case DocumentationPackage.DOCUMENTATION__AUTHOR:
-				return getAuthor();
-			case DocumentationPackage.DOCUMENTATION__CONTENT:
-				return getContent();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case DocumentationPackage.DOCUMENTATION__AUTHOR:
-				setAuthor((String)newValue);
-				return;
-			case DocumentationPackage.DOCUMENTATION__CONTENT:
-				setContent((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case DocumentationPackage.DOCUMENTATION__AUTHOR:
-				setAuthor(AUTHOR_EDEFAULT);
-				return;
-			case DocumentationPackage.DOCUMENTATION__CONTENT:
-				setContent(CONTENT_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case DocumentationPackage.DOCUMENTATION__AUTHOR:
-				return AUTHOR_EDEFAULT == null ? author != null : !AUTHOR_EDEFAULT.equals(author);
-			case DocumentationPackage.DOCUMENTATION__CONTENT:
-				return CONTENT_EDEFAULT == null ? content != null : !CONTENT_EDEFAULT.equals(content);
-		}
-		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(" (author: ");
-		result.append(author);
-		result.append(", content: ");
-		result.append(content);
-		result.append(')');
-		return result.toString();
-	}
-
-} //DocumentationImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationPackageImpl.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationPackageImpl.java
deleted file mode 100644
index 63457bc..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/impl/DocumentationPackageImpl.java
+++ /dev/null
@@ -1,219 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationPackageImpl.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.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.samples.eclipseSummit08.annotations.documentation.Documentation;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationFactory;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.DocumentationPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class DocumentationPackageImpl extends EPackageImpl implements DocumentationPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass documentationEClass = 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.samples.eclipseSummit08.annotations.documentation.DocumentationPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private DocumentationPackageImpl() {
-		super(eNS_URI, DocumentationFactory.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 DocumentationPackage init() {
-		if (isInited) return (DocumentationPackage)EPackage.Registry.INSTANCE.getEPackage(DocumentationPackage.eNS_URI);
-
-		// Obtain or create and register package
-		DocumentationPackageImpl theDocumentationPackage = (DocumentationPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof DocumentationPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new DocumentationPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theDocumentationPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theDocumentationPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theDocumentationPackage.freeze();
-
-		return theDocumentationPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getDocumentation() {
-		return documentationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentation_Author() {
-		return (EAttribute)documentationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getDocumentation_Content() {
-		return (EAttribute)documentationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentationFactory getDocumentationFactory() {
-		return (DocumentationFactory)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
-		documentationEClass = createEClass(DOCUMENTATION);
-		createEAttribute(documentationEClass, DOCUMENTATION__AUTHOR);
-		createEAttribute(documentationEClass, DOCUMENTATION__CONTENT);
-	}
-
-	/**
-	 * <!-- 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(documentationEClass, Documentation.class, "Documentation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getDocumentation_Author(), ecorePackage.getEString(), "author", null, 0, 1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getDocumentation_Content(), ecorePackage.getEString(), "content", null, 0, 1, Documentation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-
-		// Create annotations
-		// org.eclipse.tigerstripe.annotation
-		createOrgAnnotations();
-	}
-
-	/**
-	 * Initializes the annotations for <b>org.eclipse.tigerstripe.annotation</b>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected void createOrgAnnotations() {
-		String source = "org.eclipse.tigerstripe.annotation";		
-		addAnnotation
-		  (getDocumentation_Content(), 
-		   source, 
-		   new String[] {
-			 "editor", "org.eclipse.wst.html.core.htmlsource.source"
-		   });
-	}
-
-} //DocumentationPackageImpl
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/util/DocumentationAdapterFactory.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/util/DocumentationAdapterFactory.java
deleted file mode 100644
index 8aad8b6..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/util/DocumentationAdapterFactory.java
+++ /dev/null
@@ -1,124 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationAdapterFactory.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.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.samples.eclipseSummit08.annotations.documentation.*;
-
-/**
- * <!-- 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.samples.eclipseSummit08.annotations.documentation.DocumentationPackage
- * @generated
- */
-public class DocumentationAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static DocumentationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentationAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = DocumentationPackage.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 that delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected DocumentationSwitch<Adapter> modelSwitch =
-		new DocumentationSwitch<Adapter>() {
-			@Override
-			public Adapter caseDocumentation(Documentation object) {
-				return createDocumentationAdapter();
-			}
-			@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.samples.eclipseSummit08.annotations.documentation.Documentation <em>Documentation</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.samples.eclipseSummit08.annotations.documentation.Documentation
-	 * @generated
-	 */
-	public Adapter createDocumentationAdapter() {
-		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;
-	}
-
-} //DocumentationAdapterFactory
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/util/DocumentationSwitch.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/util/DocumentationSwitch.java
deleted file mode 100644
index 6fad049..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation/util/DocumentationSwitch.java
+++ /dev/null
@@ -1,130 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: DocumentationSwitch.java,v 1.1 2008/11/05 19:53:22 edillon Exp $
- */
-package org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.*;
-
-/**
- * <!-- 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.samples.eclipseSummit08.annotations.documentation.DocumentationPackage
- * @generated
- */
-public class DocumentationSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static DocumentationPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public DocumentationSwitch() {
-		if (modelPackage == null) {
-			modelPackage = DocumentationPackage.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 DocumentationPackage.DOCUMENTATION: {
-				Documentation documentation = (Documentation)theEObject;
-				T result = caseDocumentation(documentation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Documentation</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>Documentation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseDocumentation(Documentation 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;
-	}
-
-} //DocumentationSwitch
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/audit/DocumentedEntityAuditor.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/audit/DocumentedEntityAuditor.java
deleted file mode 100644
index 0a875d8..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/audit/DocumentedEntityAuditor.java
+++ /dev/null
@@ -1,56 +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. - erdillon
- *******************************************************************************/
-package org.eclipse.tigerstripe.samples.eclipseSummit08.audit;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IProgressMonitor;
-import org.eclipse.tigerstripe.metamodel.IManagedEntityArtifact;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation;
-import org.eclipse.tigerstripe.workbench.internal.builder.IArtifactAuditor;
-import org.eclipse.tigerstripe.workbench.internal.builder.TigerstripeProjectAuditor;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-
-public class DocumentedEntityAuditor implements IArtifactAuditor {
-
-	static private String FAULT_PREFIX = "Documentation: ";
-
-	public void reportError(String msg, IResource srcFile, int violation) {
-		TigerstripeProjectAuditor.reportError(FAULT_PREFIX + msg, srcFile,
-				violation);
-	}
-
-	private IAbstractArtifact artifact;
-	private IProject project;
-
-	public void run(IProgressMonitor monitor) {
-		if (!(artifact instanceof IManagedEntityArtifact))
-			return;
-
-		Documentation doc = (Documentation) artifact
-				.getAnnotation("Documentation");
-		if (doc == null || doc.getContent().length() == 0) {
-			reportError("Missing documentation on "
-					+ artifact.getFullyQualifiedName(), getIResource(), 222);
-		}
-	}
-
-	public void setDetails(IProject project, IAbstractArtifact artifact) {
-		this.artifact = artifact;
-		this.project = project;
-	}
-
-	protected IResource getIResource() {
-		return TigerstripeProjectAuditor.getIResourceForArtifact(project,
-				artifact);
-	}
-
-}
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/DocumentedLabelDecorator.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/DocumentedLabelDecorator.java
deleted file mode 100644
index 88af396..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/DocumentedLabelDecorator.java
+++ /dev/null
@@ -1,107 +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. - erdillon
- *******************************************************************************/
-package org.eclipse.tigerstripe.samples.eclipseSummit08.ui;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.jface.resource.ImageRegistry;
-import org.eclipse.jface.viewers.DecorationOverlayIcon;
-import org.eclipse.jface.viewers.IDecoration;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.Activator;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent;
-import org.eclipse.tigerstripe.workbench.ui.viewers.BaseLabelDecorator;
-import org.eclipse.tigerstripe.workbench.ui.viewers.ITigerstripeLabelDecorator;
-
-public class DocumentedLabelDecorator extends BaseLabelDecorator implements
-		ITigerstripeLabelDecorator {
-
-	protected URL baseURL = Activator.getDefault().getBundle().getEntry(
-			"icons/"); //$NON-NLS-1$
-
-	private static ImageRegistry images;
-
-	protected static ImageRegistry getImages() {
-		if (images == null) {
-			images = new ImageRegistry();
-		}
-		return images;
-	}
-
-	protected static Image addImage(String key, Image image) {
-		getImages().put(key, image);
-		return image;
-	}
-
-	protected static Image addImage(String key, ImageDescriptor descriptor) {
-		getImages().put(key, descriptor);
-		return getImage(key);
-	}
-
-	protected static Image getImage(String key) {
-		return getImages().get(key);
-	}
-
-	public Image decorateImage(Image image, IModelComponent component) {
-		if (component == null)
-			return image;
-		if (component instanceof IAbstractArtifact) {
-			Note ann = (Note) component.getAnnotation("Note");
-			if (ann != null) {
-				String key = component.getClass().getName() + "_doc";
-				Image newImage = overlayImage(image, key, "pencil.png");
-				if (newImage != null)
-					image = newImage;
-			}
-		}
-		return image;
-	}
-
-	/**
-	 * Finds the overlaid image to match the supplied component - either gets it
-	 * from the <code>ImageRegistry</code> or creates it from the supplied image
-	 * and file-name of the overlay image
-	 * 
-	 * @param image
-	 *            the input image to be overlaid
-	 * @param key
-	 *            the key that will locate the overlaid image in the
-	 *            <code>ImageRegistry</code>
-	 * @param overlayName
-	 *            the name of the file containing the overlay image
-	 * @return the new image with the required overlay
-	 */
-	protected Image overlayImage(Image image, String key, String overlayName) {
-		Image newImage = getImage(key);
-		if (newImage == null) {
-			try {
-				URL iconURL = new URL(baseURL, overlayName);
-				ImageDescriptor descriptor = ImageDescriptor
-						.createFromURL(iconURL);
-				descriptor = new DecorationOverlayIcon(image, descriptor,
-						IDecoration.TOP_RIGHT);
-				newImage = addImage(key, descriptor);
-			} catch (MalformedURLException e) {
-				e.printStackTrace();
-			}
-		}
-		return newImage;
-	}
-
-	public String decorateText(String text, IModelComponent component) {
-		return text;
-	}
-}
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/IconProvider.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/IconProvider.java
deleted file mode 100644
index 00bef88..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/IconProvider.java
+++ /dev/null
@@ -1,61 +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. - erdillon
- *******************************************************************************/
-package org.eclipse.tigerstripe.samples.eclipseSummit08.ui;
-
-import java.net.URL;
-
-import org.eclipse.tigerstripe.repository.metamodel.providers.IModelComponentIconProvider;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.Activator;
-import org.eclipse.tigerstripe.workbench.model.annotation.IAnnotationCapable;
-
-public class IconProvider implements IModelComponentIconProvider {
-
-	protected URL baseURL = Activator.getDefault().getBundle().getEntry(
-			"icons/"); //$NON-NLS-1$
-
-	protected URL docEntity_url = null;
-
-	public IconProvider() {
-		try {
-			docEntity_url = new URL(baseURL, "cube.png");
-		} catch (Exception e) {
-			e.printStackTrace();
-		}
-	}
-
-	public URL getCreationToolIconURL(Object context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public String getCreationToolLabel(Object context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public URL getGreyedoutIconURL(Object context) {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	public URL getIconURL(Object context) {
-		if (context == null)
-			return null;
-		if (context instanceof IAnnotationCapable) {
-			IAnnotationCapable cap = (IAnnotationCapable) context;
-			if (cap.hasAnnotations("Documentation")) {
-				return docEntity_url;
-			}
-		}
-		return null;
-	}
-
-}
diff --git a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/LabelProvider.java b/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/LabelProvider.java
deleted file mode 100644
index 752a3cb..0000000
--- a/samples/EclipseSummit08/EclipseSummit08_annotations/src/org/eclipse/tigerstripe/samples/eclipseSummit08/ui/LabelProvider.java
+++ /dev/null
@@ -1,82 +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. - erdillon
- *******************************************************************************/
-package org.eclipse.tigerstripe.samples.eclipseSummit08.ui;
-
-import org.eclipse.jface.resource.ImageDescriptor;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.Activator;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.TODO;
-import org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.documentation.Documentation;
-
-public class LabelProvider extends org.eclipse.jface.viewers.LabelProvider {
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.jface.viewers.LabelProvider#getImage(java.lang.Object)
-	 */
-	@Override
-	public Image getImage(Object element) {
-		ImageDescriptor des = getDescriptor(element);
-		if (des != null)
-			return des.createImage();
-		return super.getImage(element);
-	}
-
-	protected ImageDescriptor getDescriptor(Object element) {
-		if (element instanceof Documentation)
-			return Activator.createImage("icons/documentation.png");
-		if (element instanceof TODO)
-			return Activator.createImage("icons/todo.png");
-		if (element instanceof Note) {
-			return Activator.createImage("icons/designNote.png");
-		}
-		return null;
-	}
-
-	@Override
-	public String getText(Object element) {
-		if (element instanceof Documentation) {
-			Documentation doc = (Documentation) element;
-			if (doc.getAuthor() != null && doc.getAuthor().length() != 0) {
-				return "Documentation (" + doc.getAuthor() + ")";
-			}
-			return "Documentation";
-		} else if (element instanceof Note) {
-			Note note = (Note) element;
-			String text = note.getText();
-
-			if (text == null)
-				return "Note";
-
-			if (text.length() < 6) {
-				return "Note: " + text;
-			} else {
-				return "Note: " + text.substring(0, 5) + "...";
-			}
-		} else if (element instanceof TODO) {
-			TODO todo = (TODO) element;
-			String text = todo.getSummary();
-
-			if (text == null)
-				return "TODO";
-
-			if (text.length() < 6) {
-				return "TODO: " + text;
-			} else {
-				return "TODO: " + text.substring(0, 5) + "...";
-			}
-		}
-		return super.getText(element);
-	}
-
-}
diff --git a/samples/EclipseSummit08/Equipment-model/.classpath b/samples/EclipseSummit08/Equipment-model/.classpath
deleted file mode 100644
index c2d6159..0000000
--- a/samples/EclipseSummit08/Equipment-model/.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="PROFILE_ARTIFACTS_LIB"/>
-	<classpathentry combineaccessrules="false" exported="true" kind="src" path="/common-model"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/samples/EclipseSummit08/Equipment-model/.cvsignore b/samples/EclipseSummit08/Equipment-model/.cvsignore
deleted file mode 100644
index eb5a316..0000000
--- a/samples/EclipseSummit08/Equipment-model/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-target
diff --git a/samples/EclipseSummit08/Equipment-model/.project b/samples/EclipseSummit08/Equipment-model/.project
deleted file mode 100644
index ca2222a..0000000
--- a/samples/EclipseSummit08/Equipment-model/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>Equipment-model</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.tigerstripeProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripeProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/samples/EclipseSummit08/Equipment-model/.settings/org.eclipse.core.resources.prefs b/samples/EclipseSummit08/Equipment-model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 26f24c0..0000000
--- a/samples/EclipseSummit08/Equipment-model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Nov 04 12:27:06 PST 2008
-eclipse.preferences.version=1
-encoding/equipment-classes.vwm=UTF-8
-encoding/equipment-classes.wvd=UTF-8
-encoding/router-examples.owm=UTF-8
-encoding/router-examples.wod=UTF-8
diff --git a/samples/EclipseSummit08/Equipment-model/annotations/org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.ann b/samples/EclipseSummit08/Equipment-model/annotations/org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.ann
deleted file mode 100644
index 9a4a853..0000000
--- a/samples/EclipseSummit08/Equipment-model/annotations/org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.ann
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:d="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore" xmlns:dn="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.tigerstripe.annotation="http:///org/eclipse/tigerstripe/annotation.ecore">
-  <ecoreDefinition>
-    <ecore:EPackage name="documentation" nsURI="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore" nsPrefix="d">
-      <eClassifiers xsi:type="ecore:EClass" name="Documentation">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="author">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="content">
-          <eAnnotations source="org.eclipse.tigerstripe.annotation">
-            <details key="editor" value="org.eclipse.wst.html.core.htmlsource.source"/>
-          </eAnnotations>
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </ecore:EPackage>
-    <ecore:EPackage name="designNotes" nsURI="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore" nsPrefix="dn">
-      <eClassifiers xsi:type="ecore:EClass" name="Note">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="Text">
-          <eAnnotations source="org.eclipse.tigerstripe.annotation">
-            <details key="multiline" value="true"/>
-          </eAnnotations>
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="TODO">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="hack">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </ecore:EPackage>
-  </ecoreDefinition>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/Equipment-model/com.mycompany.equipment.Equipment" id="_-cigkatjEd2Fn5wMz1rR3w">
-    <content xsi:type="d:Documentation" author="Eric" content="&lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01 Transitional//EN&quot; &quot;http://www.w3.org/TR/html4/loose.dtd&quot;>&#xA;&lt;html>&#xA;&lt;head>&#xA;&lt;meta http-equiv=&quot;Content-Type&quot; content=&quot;text/html; charset=UTF-8&quot;>&#xA;&lt;title>Title goes here&lt;/title>&#xA;&lt;/head>&#xA;&lt;body>&#xA;This is the documentation.&#xA;&lt;/body>&#xA;&lt;/html>"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/Equipment-model/com.mycompany.equipment.Port" id="_V4p50KtxEd2SuOGpYxGrwA">
-    <content xsi:type="dn:Note" Text="This is a simplistic Port model!"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/Equipment-model/com.mycompany.equipment.Port" id="_eBY7gKtxEd2SuOGpYxGrwA">
-    <content xsi:type="d:Documentation" author="Eric" content="&lt;html>&#xA;&#x9;Content!&#xA;&lt;/html>"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/Equipment-model/com.mycompany.equipment.Equipment" id="_UaiaIKwuEd2z2tbrb1IElA">
-    <content xsi:type="dn:Note"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/Equipment-model/com.mycompany.equipment.Router" id="_RUFX0Kw0Ed2uxszr3XQSIA">
-    <content xsi:type="d:Documentation"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-</xmi:XMI>
diff --git a/samples/EclipseSummit08/Equipment-model/buckminster.cspec b/samples/EclipseSummit08/Equipment-model/buckminster.cspec
deleted file mode 100644
index 927f036..0000000
--- a/samples/EclipseSummit08/Equipment-model/buckminster.cspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="Equipment-model" componentType="tigerstripe" version="1.0.0" versionType="OSGi">
-    <cs:artifacts>
-        <cs:private name="classlevel-generator" path="ClassLevel-Generator/" type="tigerstripe.generator"/>
-    </cs:artifacts>
-    <cs:actions>
-        <cs:public name="tigerstripe.installGenerator" actor="tigerstripe.installGenerator">
-            <cs:actorProperties>
-                <cs:property key="projectname" value="ClassLevel-Generator"/>
-            </cs:actorProperties>
-            <cs:prerequisites>
-                <cs:attribute name="classlevel-generator"/>
-            </cs:prerequisites>
-        </cs:public>
-    </cs:actions>
-</cs:cspec>
diff --git a/samples/EclipseSummit08/Equipment-model/equipment-classes.vwm b/samples/EclipseSummit08/Equipment-model/equipment-classes.vwm
deleted file mode 100644
index f990e6b..0000000
--- a/samples/EclipseSummit08/Equipment-model/equipment-classes.vwm
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<null:Map xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:null="null" basePackage="com.mycompany.equipment">
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Resource" package="com.mycompany" extends="//@artifacts.4">
-    <properties name="artifact.hide.extends" value="false"/>
-    <attributes name="status" type="com.mycompany.commonTypes.AvailabilityStatusEnum" isUnique="true"/>
-  </artifacts>
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Equipment" package="com.mycompany.equipment" extends="//@artifacts.0"/>
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Router" package="com.mycompany.equipment" extends="//@artifacts.1"/>
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Port" package="com.mycompany.equipment" extends="//@artifacts.0">
-    <attributes name="attribute0" type="com.mycompany.commonTypes.IPAddress" isUnique="true"/>
-  </artifacts>
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Top" package="com.mycompany" isAbstract="true"/>
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Location" package="com.mycompany" extends="//@artifacts.4"/>
-  <artifacts xsi:type="null:ManagedEntityArtifact" name="Party" package="com.mycompany" extends="//@artifacts.4"/>
-  <associations name="hasPorts" package="com.mycompany.equipment" aEnd="//@artifacts.2" aEndName="router_0" zEnd="//@artifacts.3" zEndName="port_0" zEndMultiplicity="*" zEndIsNavigable="true"/>
-</null:Map>
diff --git a/samples/EclipseSummit08/Equipment-model/equipment-classes.wvd b/samples/EclipseSummit08/Equipment-model/equipment-classes.wvd
deleted file mode 100644
index 9d25c6c..0000000
--- a/samples/EclipseSummit08/Equipment-model/equipment-classes.wvd
+++ /dev/null
@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:null="null" xmlns:org.eclipse.tigerstripe.annotation.ui.diagrams.model="http:///org/eclipse/tigerstripe/annotation/ui/diagrams/model.ecore" xmi:id="_QjA-4KnREd2QWYqA-zqzBg" type="Tigerstripe" name="equipment-classes.wvd" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_SaCK4KnREd2QWYqA-zqzBg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_SaF1QKnREd2QWYqA-zqzBg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_SaIRgKnREd2QWYqA-zqzBg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_SaJfoKnREd2QWYqA-zqzBg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SaJfoanREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SaJfoqnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SaJfo6nREd2QWYqA-zqzBg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_SaKtwKnREd2QWYqA-zqzBg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_SaKtwanREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_SaKtwqnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_SaKtw6nREd2QWYqA-zqzBg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_SaCK4anREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_SaCK4qnREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_SaCK46nREd2QWYqA-zqzBg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_SaCK5KnREd2QWYqA-zqzBg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.0"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SaCK5anREd2QWYqA-zqzBg" x="144" y="144"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_TcOAoKnREd2QWYqA-zqzBg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_TcOApqnREd2QWYqA-zqzBg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_TcOnsKnREd2QWYqA-zqzBg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_TcOnsanREd2QWYqA-zqzBg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_TcOnsqnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TcOns6nREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TcOntKnREd2QWYqA-zqzBg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_TcOntanREd2QWYqA-zqzBg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_TcOntqnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_TcOnt6nREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_TcOnuKnREd2QWYqA-zqzBg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_TcOAoanREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_TcOAoqnREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_TcOAo6nREd2QWYqA-zqzBg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_TcOApKnREd2QWYqA-zqzBg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.1"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_TcOApanREd2QWYqA-zqzBg" x="90" y="225"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_W1g3sKnREd2QWYqA-zqzBg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_W1hewKnREd2QWYqA-zqzBg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_W1iF0KnREd2QWYqA-zqzBg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_W1iF0anREd2QWYqA-zqzBg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_W1iF0qnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_W1iF06nREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_W1iF1KnREd2QWYqA-zqzBg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_W1is4KnREd2QWYqA-zqzBg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_W1is4anREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_W1is4qnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_W1is46nREd2QWYqA-zqzBg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_W1g3sanREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_W1g3sqnREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_W1g3s6nREd2QWYqA-zqzBg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_W1g3tKnREd2QWYqA-zqzBg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.2"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_W1g3tanREd2QWYqA-zqzBg" x="36" y="312"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ZP4BUKnREd2QWYqA-zqzBg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_ZP5PcKnREd2QWYqA-zqzBg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_ZQDAcKnREd2QWYqA-zqzBg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_ZQEOkKnREd2QWYqA-zqzBg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ZQEOkanREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ZQEOkqnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ZQEOk6nREd2QWYqA-zqzBg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_ZQE1oKnREd2QWYqA-zqzBg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ZQE1oanREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ZQE1oqnREd2QWYqA-zqzBg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ZQE1o6nREd2QWYqA-zqzBg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ZP4oYKnREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_ZP4oYanREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_ZP4oYqnREd2QWYqA-zqzBg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_ZP4oY6nREd2QWYqA-zqzBg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.3"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ZP4oZKnREd2QWYqA-zqzBg" x="264" y="317"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_0u6T4KnSEd2kAZEtl8jGtg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_0u7iAKnSEd2kAZEtl8jGtg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_0u8JEKnSEd2kAZEtl8jGtg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_0u8wIKnSEd2kAZEtl8jGtg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0u8wIanSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0u8wIqnSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0u8wI6nSEd2kAZEtl8jGtg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_0vAagKnSEd2kAZEtl8jGtg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_0vAaganSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_0vAagqnSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_0vAag6nSEd2kAZEtl8jGtg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0u6T4anSEd2kAZEtl8jGtg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_0u6T4qnSEd2kAZEtl8jGtg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_0u6T46nSEd2kAZEtl8jGtg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_0u6T5KnSEd2kAZEtl8jGtg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.4"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_0u6T5anSEd2kAZEtl8jGtg" x="288" y="45"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_1siZwKnSEd2kAZEtl8jGtg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_1sjA0KnSEd2kAZEtl8jGtg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_1sjA0anSEd2kAZEtl8jGtg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_1sjn4KnSEd2kAZEtl8jGtg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1sjn4anSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1sjn4qnSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1sjn46nSEd2kAZEtl8jGtg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_1sjn5KnSEd2kAZEtl8jGtg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_1sjn5anSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_1sjn5qnSEd2kAZEtl8jGtg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_1sjn56nSEd2kAZEtl8jGtg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1siZwanSEd2kAZEtl8jGtg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_1siZwqnSEd2kAZEtl8jGtg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_1siZw6nSEd2kAZEtl8jGtg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_1siZxKnSEd2kAZEtl8jGtg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.5"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_1siZxanSEd2kAZEtl8jGtg" x="342" y="144"/>
-  </children>
-  <children xmi:type="org.eclipse.tigerstripe.annotation.ui.diagrams.model:MetaAnnotationNode" xmi:id="_O8X98KnhEd2KtZt5OUSjFg" type="MetaAnnotation">
-    <children xmi:type="org.eclipse.tigerstripe.annotation.ui.diagrams.model:MetaViewAnnotations" xmi:id="_aBiawKtxEd2SuOGpYxGrwA" type="MetaViewAnnotation" view="_ZP4BUKnREd2QWYqA-zqzBg">
-      <styles xmi:type="notation:ShapeStyle" xmi:id="_aBiawatxEd2SuOGpYxGrwA" fontName="Lucida Grande" fillColor="9434110" lineColor="6661313"/>
-      <element xsi:nil="true"/>
-      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aBiawqtxEd2SuOGpYxGrwA"/>
-      <types>org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.designNotes.Note</types>
-    </children>
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_O8cPYKnhEd2KtZt5OUSjFg" fontName="Lucida Grande" fillColor="9434110" lineColor="6661313"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_O8cPYanhEd2KtZt5OUSjFg"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_e1Wo0KnhEd2KtZt5OUSjFg" type="1003">
-    <children xmi:type="notation:Node" xmi:id="_e1aTMKnhEd2KtZt5OUSjFg" type="4005"/>
-    <children xmi:type="notation:Node" xmi:id="_e1a6QKnhEd2KtZt5OUSjFg" type="4006"/>
-    <children xmi:type="notation:Node" xmi:id="_e1bhUKnhEd2KtZt5OUSjFg" type="5003">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e1cIYKnhEd2KtZt5OUSjFg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e1cIYanhEd2KtZt5OUSjFg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e1cIYqnhEd2KtZt5OUSjFg"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_e1cvcKnhEd2KtZt5OUSjFg" type="5004">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_e1cvcanhEd2KtZt5OUSjFg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_e1cvcqnhEd2KtZt5OUSjFg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_e1cvc6nhEd2KtZt5OUSjFg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e1Wo0anhEd2KtZt5OUSjFg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_e1Wo0qnhEd2KtZt5OUSjFg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_e1Wo06nhEd2KtZt5OUSjFg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_e1Wo1KnhEd2KtZt5OUSjFg"/>
-    <element xmi:type="null:ManagedEntityArtifact" href="equipment-classes.vwm#//@artifacts.6"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_e1Wo1anhEd2KtZt5OUSjFg" x="495" y="88"/>
-  </children>
-  <children xmi:type="org.eclipse.tigerstripe.annotation.ui.diagrams.model:AnnotationNode" xmi:id="_aAdcsKtxEd2SuOGpYxGrwA" type="Annotation" annotationId="_V4p50KtxEd2SuOGpYxGrwA">
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_aAdcsatxEd2SuOGpYxGrwA" fontName="Lucida Grande" fillColor="9434110" lineColor="6661313"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aAdcsqtxEd2SuOGpYxGrwA" x="414" y="252"/>
-  </children>
-  <children xmi:type="org.eclipse.tigerstripe.annotation.ui.diagrams.model:ViewLocationNode" xmi:id="_aBJZMKtxEd2SuOGpYxGrwA" type="ViewLocationNode" view="_ZP4BUKnREd2QWYqA-zqzBg">
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_aBJZMatxEd2SuOGpYxGrwA" fontName="Lucida Grande" fillColor="9434110" lineColor="6661313"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aBJZMqtxEd2SuOGpYxGrwA" x="264" y="317" width="118" height="57"/>
-  </children>
-  <styles xmi:type="notation:PageStyle" xmi:id="_QjA-4anREd2QWYqA-zqzBg"/>
-  <styles xmi:type="notation:GuideStyle" xmi:id="_QjA-4qnREd2QWYqA-zqzBg"/>
-  <styles xmi:type="notation:DescriptionStyle" xmi:id="_QjA-46nREd2QWYqA-zqzBg"/>
-  <element xmi:type="null:Map" href="equipment-classes.vwm#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_U1ikAKnREd2QWYqA-zqzBg" type="3007" source="_TcOAoKnREd2QWYqA-zqzBg" target="_SaCK4KnREd2QWYqA-zqzBg">
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_U1ikAanREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_U1ikAqnREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_U1ikA6nREd2QWYqA-zqzBg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_U1ikBKnREd2QWYqA-zqzBg" points="[8, -34, -40, 142]$[41, -204, -7, -28]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_U1m1cKnREd2QWYqA-zqzBg" id="(0.61904764,0.14)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_YZi2QKnREd2QWYqA-zqzBg" type="3007" source="_W1g3sKnREd2QWYqA-zqzBg" target="_TcOAoKnREd2QWYqA-zqzBg">
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_YZi2QanREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_YZi2QqnREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_YZjdUKnREd2QWYqA-zqzBg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_YZjdUanREd2QWYqA-zqzBg" points="[0, 0, -38, 125]$[68, -100, 30, 25]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_aOkeMKnREd2QWYqA-zqzBg" type="3007" source="_ZP4BUKnREd2QWYqA-zqzBg" target="_SaCK4KnREd2QWYqA-zqzBg">
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_aOkeManREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_aOkeMqnREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_aOkeM6nREd2QWYqA-zqzBg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aOkeNKnREd2QWYqA-zqzBg" points="[-15, -36, 124, 207]$[-59, -241, 80, 2]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_aOm6cKnREd2QWYqA-zqzBg" id="(1.0,0.72)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_bNSwQKnREd2QWYqA-zqzBg" type="3001" source="_W1g3sKnREd2QWYqA-zqzBg" target="_ZP4BUKnREd2QWYqA-zqzBg">
-    <children xmi:type="notation:Node" xmi:id="_bNgLoKnREd2QWYqA-zqzBg" type="4020">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bNgLoanREd2QWYqA-zqzBg" y="-30"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bNlrMKnREd2QWYqA-zqzBg" type="4021">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bNlrManREd2QWYqA-zqzBg" y="-15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bNougKnREd2QWYqA-zqzBg" type="4022">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bNouganREd2QWYqA-zqzBg" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bNp8oKnREd2QWYqA-zqzBg" type="4023">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bNp8oanREd2QWYqA-zqzBg" x="-5" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bNqjsKnREd2QWYqA-zqzBg" type="4024">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bNqjsanREd2QWYqA-zqzBg" y="-15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_bNrKwKnREd2QWYqA-zqzBg" type="4025">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_bNrKwanREd2QWYqA-zqzBg" x="-5" y="-15"/>
-    </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_bNSwQanREd2QWYqA-zqzBg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_bNSwQqnREd2QWYqA-zqzBg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_bNSwQ6nREd2QWYqA-zqzBg"/>
-    <element xmi:type="null:Association" href="equipment-classes.vwm#//@associations.0"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_bNSwRKnREd2QWYqA-zqzBg" points="[0, 0, -201, 4]$[181, -3, -20, 1]"/>
-    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_bPtyIKnREd2QWYqA-zqzBg" id="(1.0,0.7)"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_0wNUYKnSEd2kAZEtl8jGtg" type="3007" source="_SaCK4KnREd2QWYqA-zqzBg" target="_0u6T4KnSEd2kAZEtl8jGtg">
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_0wNUYanSEd2kAZEtl8jGtg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_0wNUYqnSEd2kAZEtl8jGtg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_0wNUY6nSEd2kAZEtl8jGtg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_0wNUZKnSEd2kAZEtl8jGtg" points="[39, -28, -71, 51]$[75, -54, -35, 25]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_1st_8KnSEd2kAZEtl8jGtg" type="3007" source="_1siZwKnSEd2kAZEtl8jGtg" target="_0u6T4KnSEd2kAZEtl8jGtg">
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_1st_8anSEd2kAZEtl8jGtg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_1st_8qnSEd2kAZEtl8jGtg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_1st_86nSEd2kAZEtl8jGtg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_1st_9KnSEd2kAZEtl8jGtg" points="[-24, -25, 79, 85]$[-80, -85, 23, 25]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_e12YEKnhEd2KtZt5OUSjFg" type="3007" source="_e1Wo0KnhEd2KtZt5OUSjFg" target="_0u6T4KnSEd2kAZEtl8jGtg">
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_e12YEanhEd2KtZt5OUSjFg"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_e12YEqnhEd2KtZt5OUSjFg" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_e12YE6nhEd2KtZt5OUSjFg"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_e12YFKnhEd2KtZt5OUSjFg" points="[-59, -12, 155, 31]$[-161, -33, 53, 10]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_aBZ34KtxEd2SuOGpYxGrwA" type="AnnotationConnection" source="_aAdcsKtxEd2SuOGpYxGrwA" target="_aBJZMKtxEd2SuOGpYxGrwA">
-    <styles xmi:type="notation:ConnectorStyle" xmi:id="_aBZ34atxEd2SuOGpYxGrwA"/>
-    <element xsi:nil="true"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_aBZ34qtxEd2SuOGpYxGrwA" points="[0, 0, -323, -345]$[323, 317, 0, -28]"/>
-  </edges>
-</notation:Diagram>
diff --git a/samples/EclipseSummit08/Equipment-model/readme.html b/samples/EclipseSummit08/Equipment-model/readme.html
deleted file mode 100644
index cac844a..0000000
--- a/samples/EclipseSummit08/Equipment-model/readme.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ReadME</title>
-</head>
-<body>
-Visit
-<a href="http://wiki.eclipse.org/TigerstripeAtEclipseSummit08">http://wiki.eclipse.org/TigerstripeAtEclipseSummit08</a>
-for detail.
-</body>
-</html>
\ No newline at end of file
diff --git a/samples/EclipseSummit08/Equipment-model/router-examples.owm b/samples/EclipseSummit08/Equipment-model/router-examples.owm
deleted file mode 100644
index a4059b3..0000000
--- a/samples/EclipseSummit08/Equipment-model/router-examples.owm
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<instancediagram:InstanceMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:instancediagram="org.eclipse.tigerstripe.workbench.ui.instancediagram" basePackage="com.mycompany">
-  <classInstances name="Port" package="com.mycompany.equipment" artifactName="p1">
-    <variables name="attribute0" type="IPAddress" value="IP1"/>
-    <variables name="status" type="AvailabilityStatusEnum" value="available"/>
-  </classInstances>
-  <classInstances name="Router" package="com.mycompany.equipment" artifactName="SOHORouter">
-    <variables name="status" type="AvailabilityStatusEnum" value="available"/>
-  </classInstances>
-  <classInstances name="Port" package="com.mycompany.equipment" artifactName="p2">
-    <variables name="attribute0" type="IPAddress" value="IP2"/>
-    <variables name="status" type="AvailabilityStatusEnum" value="available"/>
-  </classInstances>
-  <classInstances name="IPAddress" package="com.mycompany.commonTypes" artifactName="IP1">
-    <variables name="isIPv6Address" type="boolean" value="false"/>
-    <variables name="addressString" type="String" value="192.168.0.1"/>
-  </classInstances>
-  <classInstances name="IPAddress" package="com.mycompany.commonTypes" artifactName="IP2">
-    <variables name="isIPv6Address" type="boolean" value="false"/>
-    <variables name="addressString" type="String" value="192.168.1.1"/>
-  </classInstances>
-  <associationInstances name="hasPorts" package="com.mycompany.equipment" aEnd="//@classInstances.1" aEndName="router_0" zEnd="//@classInstances.0" zEndName="port_0" zEndIsNavigable="true"/>
-  <associationInstances name="hasPorts" package="com.mycompany.equipment" aEnd="//@classInstances.1" aEndName="router_0" zEnd="//@classInstances.2" zEndName="port_0" zEndIsNavigable="true"/>
-</instancediagram:InstanceMap>
diff --git a/samples/EclipseSummit08/Equipment-model/router-examples.wod b/samples/EclipseSummit08/Equipment-model/router-examples.wod
deleted file mode 100644
index bf859a6..0000000
--- a/samples/EclipseSummit08/Equipment-model/router-examples.wod
+++ /dev/null
@@ -1,126 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:instancediagram="org.eclipse.tigerstripe.workbench.ui.instancediagram" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:org.eclipse.tigerstripe.annotation.ui.diagrams.model="http:///org/eclipse/tigerstripe/annotation/ui/diagrams/model.ecore" xmi:id="_8mzwQaquEd2Px-EYz15bVw" type="Instance" name="router-examples.wod" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_AHFZEKqvEd2Px-EYz15bVw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_AHGAIKqvEd2Px-EYz15bVw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_AHGnMKqvEd2Px-EYz15bVw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_AHGnMaqvEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_AHGnMqqvEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_AHGnM6qvEd2Px-EYz15bVw"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_AHFZEaqvEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_AHFZEqqvEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_AHFZE6qvEd2Px-EYz15bVw" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_AHFZFKqvEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:ClassInstance" href="router-examples.owm#//@classInstances.0"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_AHFZFaqvEd2Px-EYz15bVw" x="72" y="243"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_E7KMEKqvEd2Px-EYz15bVw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_E7KzIKqvEd2Px-EYz15bVw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_E7KzIaqvEd2Px-EYz15bVw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_E7KzIqqvEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_E7KzI6qvEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_E7KzJKqvEd2Px-EYz15bVw"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_E7KMEaqvEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_E7KMEqqvEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_E7KME6qvEd2Px-EYz15bVw" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_E7KMFKqvEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:ClassInstance" href="router-examples.owm#//@classInstances.1"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E7KMFaqvEd2Px-EYz15bVw" x="174" y="115"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_ILcREKqvEd2Px-EYz15bVw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_ILcRFqqvEd2Px-EYz15bVw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_ILc4IKqvEd2Px-EYz15bVw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_ILc4IaqvEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_ILc4IqqvEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_ILc4I6qvEd2Px-EYz15bVw"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_ILcREaqvEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_ILcREqqvEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_ILcRE6qvEd2Px-EYz15bVw" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_ILcRFKqvEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:ClassInstance" href="router-examples.owm#//@classInstances.2"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_ILcRFaqvEd2Px-EYz15bVw" x="333" y="265"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_S7UpQKqxEd2Px-EYz15bVw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_S7VQUKqxEd2Px-EYz15bVw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_S7VQUaqxEd2Px-EYz15bVw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_S7VQUqqxEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_S7VQU6qxEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_S7VQVKqxEd2Px-EYz15bVw"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_S7UpQaqxEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_S7UpQqqxEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_S7UpQ6qxEd2Px-EYz15bVw" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_S7UpRKqxEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:ClassInstance" href="router-examples.owm#//@classInstances.3"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_S7UpRaqxEd2Px-EYz15bVw" x="27" y="306"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_aAcR0KqxEd2Px-EYz15bVw" type="1001">
-    <children xmi:type="notation:Node" xmi:id="_aAc45aqxEd2Px-EYz15bVw" type="4001"/>
-    <children xmi:type="notation:Node" xmi:id="_aAdf8KqxEd2Px-EYz15bVw" type="5001">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_aAdf8aqxEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_aAdf8qqxEd2Px-EYz15bVw"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_aAdf86qxEd2Px-EYz15bVw"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_aAc44KqxEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_aAc44aqxEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_aAc44qqxEd2Px-EYz15bVw" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_aAc446qxEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:ClassInstance" href="router-examples.owm#//@classInstances.4"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_aAc45KqxEd2Px-EYz15bVw" x="324" y="333"/>
-  </children>
-  <children xmi:type="org.eclipse.tigerstripe.annotation.ui.diagrams.model:MetaAnnotationNode" xmi:id="_WuhkYKrNEd2qy48STPtzAA" type="MetaAnnotation">
-    <styles xmi:type="notation:ShapeStyle" xmi:id="_WuhkYarNEd2qy48STPtzAA" fontName="Lucida Grande" fillColor="9434110" lineColor="6661313"/>
-    <element xsi:nil="true"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_WuhkYqrNEd2qy48STPtzAA"/>
-  </children>
-  <styles xmi:type="notation:PageStyle" xmi:id="_8mzwQqquEd2Px-EYz15bVw"/>
-  <styles xmi:type="notation:GuideStyle" xmi:id="_8mzwQ6quEd2Px-EYz15bVw"/>
-  <styles xmi:type="notation:DescriptionStyle" xmi:id="_8mzwRKquEd2Px-EYz15bVw"/>
-  <element xmi:type="instancediagram:InstanceMap" href="router-examples.owm#/"/>
-  <edges xmi:type="notation:Edge" xmi:id="_FgSSYKqvEd2Px-EYz15bVw" type="3001" source="_E7KMEKqvEd2Px-EYz15bVw" target="_AHFZEKqvEd2Px-EYz15bVw">
-    <children xmi:type="notation:Node" xmi:id="_FgUHkKqvEd2Px-EYz15bVw" type="4002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FgUHkaqvEd2Px-EYz15bVw" y="-15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FgVVsKqvEd2Px-EYz15bVw" type="4003">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FgVVsaqvEd2Px-EYz15bVw" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FgV8wKqvEd2Px-EYz15bVw" type="4004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FgV8waqvEd2Px-EYz15bVw" y="-15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FgWj0KqvEd2Px-EYz15bVw" type="4005">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FgWj0aqvEd2Px-EYz15bVw" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_FgXK4KqvEd2Px-EYz15bVw" type="4006">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_FgXK4aqvEd2Px-EYz15bVw" y="-15"/>
-    </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_FgS5cKqvEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_FgS5caqvEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_FgS5cqqvEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:AssociationInstance" href="router-examples.owm#//@associationInstances.0"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_FgS5c6qvEd2Px-EYz15bVw" points="[-15, 20, 79, -135]$[-179, 154, -85, -1]"/>
-  </edges>
-  <edges xmi:type="notation:Edge" xmi:id="_Ix1isKqvEd2Px-EYz15bVw" type="3001" source="_E7KMEKqvEd2Px-EYz15bVw" target="_ILcREKqvEd2Px-EYz15bVw">
-    <children xmi:type="notation:Node" xmi:id="_Ix2Jw6qvEd2Px-EYz15bVw" type="4002">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ix2JxKqvEd2Px-EYz15bVw" y="-15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ix2JxaqvEd2Px-EYz15bVw" type="4003">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ix2JxqqvEd2Px-EYz15bVw" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ix2w0KqvEd2Px-EYz15bVw" type="4004">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ix2w0aqvEd2Px-EYz15bVw" y="-15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ix2w0qqvEd2Px-EYz15bVw" type="4005">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ix2w06qvEd2Px-EYz15bVw" y="15"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_Ix2w1KqvEd2Px-EYz15bVw" type="4006">
-      <layoutConstraint xmi:type="notation:Location" xmi:id="_Ix2w1aqvEd2Px-EYz15bVw" y="-15"/>
-    </children>
-    <styles xmi:type="notation:RoutingStyle" xmi:id="_Ix1isaqvEd2Px-EYz15bVw"/>
-    <styles xmi:type="notation:FontStyle" xmi:id="_Ix2JwKqvEd2Px-EYz15bVw" fontName="Arial"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_Ix2JwaqvEd2Px-EYz15bVw"/>
-    <element xmi:type="instancediagram:AssociationInstance" href="router-examples.owm#//@associationInstances.1"/>
-    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_Ix2JwqqvEd2Px-EYz15bVw" points="[15, 20, -116, -130]$[84, 130, -47, -20]"/>
-  </edges>
-</notation:Diagram>
diff --git a/samples/EclipseSummit08/Equipment-model/router.wfc b/samples/EclipseSummit08/Equipment-model/router.wfc
deleted file mode 100644
index 975e899..0000000
--- a/samples/EclipseSummit08/Equipment-model/router.wfc
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<contractSegment name="router" version="NO_VERSION">
-  <description>NO_DESCRIPTION</description>
-  <scope>
-    <pattern type="0">com.mycompany.equipment.Router</pattern>
-  </scope>
-  <facetRefs/>
-  <useCaseRefs/>
-</contractSegment>
diff --git a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/.package b/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/.package
deleted file mode 100644
index b695cb7..0000000
--- a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/.package
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany;
-
-
-/**
- * Holding all Equipment extensions.
- *
- * @tigerstripe.package
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class equipment
- {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Equipment.java b/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Equipment.java
deleted file mode 100644
index 7b3634c..0000000
--- a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Equipment.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.equipment;
-
-
-/**
- * ccccccx
- *
- * @tigerstripe.managedEntity primary-key="$artifact.IStandardSpecifics.PrimaryKey"
- *      extensibilityType="multi"
- *      isSessionFactoryMethods="false"
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.key-interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("
- *      generate = "true"
- * @tigerstripe.value package = "$artifact.IStandardSpecifics.InterfaceProperties.get("
- *      generate = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.create"
- *   byAutoNaming = "false"
- *   bulkBestEffort = "false"
- *   ts.id = "ossj.entity.create"
- *   bulkAtomic = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simple = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.get"
- *   byTemplates = "false"
- *   ts.id = "ossj.entity.get"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   simpleByKey = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.set"
- *   ts.id = "ossj.entity.set"
- *   simple = "true"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   byTemplatesBestEffort = "false"
- *   byTemplateBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *
- * @tigerstripe.property ts.id="ossj.entity.remove"
- *   byTemplates = "false"
- *   byTemplatesBestEffort = "false"
- *   ts.id = "ossj.entity.remove"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simpleByKey = "true"
- *   byTemplateBestEffort = "false"
- *
- * 
- */
-public abstract class Equipment
-  extends com.mycompany.Resource
- {
-
-
-
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Port.java b/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Port.java
deleted file mode 100644
index 539c030..0000000
--- a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Port.java
+++ /dev/null
@@ -1,91 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.equipment;
-
-
-/**
- * 
- *
- * @tigerstripe.managedEntity primary-key="$artifact.IStandardSpecifics.PrimaryKey"
- *      extensibilityType="multi"
- *      isSessionFactoryMethods="false"
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.key-interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("
- *      generate = "true"
- * @tigerstripe.value package = "$artifact.IStandardSpecifics.InterfaceProperties.get("
- *      generate = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.create"
- *   byAutoNaming = "false"
- *   bulkBestEffort = "false"
- *   ts.id = "ossj.entity.create"
- *   bulkAtomic = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simple = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.get"
- *   byTemplates = "false"
- *   ts.id = "ossj.entity.get"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   simpleByKey = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.set"
- *   ts.id = "ossj.entity.set"
- *   simple = "true"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   byTemplatesBestEffort = "false"
- *   byTemplateBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *
- * @tigerstripe.property ts.id="ossj.entity.remove"
- *   byTemplates = "false"
- *   byTemplatesBestEffort = "false"
- *   ts.id = "ossj.entity.remove"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simpleByKey = "true"
- *   byTemplateBestEffort = "false"
- *
- * 
- */
-public abstract class Port
-  extends com.mycompany.Resource
- {
-
-
-
-    /**
-     * 
-     * @tigerstripe.field 
-     *  isOptional = "false"
-     *  isReadOnly = "false"
-     *  isOrdered = "false"
-     *  isUnique = "true"
-     *  typeMultiplicity = "1"
-     *   ref-by = "value"
-     *
-     *
-     * 
-     */
-	public com.mycompany.commonTypes.IPAddress attribute0;
-
-
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Router.java b/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Router.java
deleted file mode 100644
index 1aa9986..0000000
--- a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/Router.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.equipment;
-
-
-/**
- * 
- *
- * @tigerstripe.managedEntity primary-key="$artifact.IStandardSpecifics.PrimaryKey"
- *      extensibilityType="multi"
- *      isSessionFactoryMethods="false"
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.key-interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * @tigerstripe.value package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.create"
- *   byAutoNaming = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simple = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.get"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   simpleByKey = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.set"
- *   simple = "true"
- *   byTemplates = "false"
- *   byTemplatesBestEffort = "false"
- *   byTemplate = "false"
- *   byTemplateBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *
- * @tigerstripe.property ts.id="ossj.entity.remove"
- *   byTemplatesBestEffort = "false"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simpleByKey = "true"
- *   byTemplateBestEffort = "false"
- *
- * 
- */
-public abstract class Router
-  extends com.mycompany.equipment.Equipment
- {
-
-
-
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/hasPorts.java b/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/hasPorts.java
deleted file mode 100644
index 1a6d323..0000000
--- a/samples/EclipseSummit08/Equipment-model/src/com/mycompany/equipment/hasPorts.java
+++ /dev/null
@@ -1,57 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.equipment;
-
-
-/**
- * 
- *
- * @tigerstripe.association
- *		isAbstract = "false"
- *
- * * 
- */
-public abstract class hasPorts
- {
-
-
-	/**
- * 
-	 *	@tigerstripe.association-aEnd
-	 *    aggregation = "none"
-	 *    changeable = "none"
-	 *    multiplicity = "1"
-	 *    isOrdered = "false"
-	 *    isUnique = "false"
-	 *    isNavigable = "false"
-	 *
- *
-     * 
-	 */	
-	public com.mycompany.equipment.Router router_0 = null;
-	
-	/**
- * 
-	 *	@tigerstripe.association-zEnd
-	 *    aggregation = "none"
-	 *    changeable = "none"
-	 *    multiplicity = "*"
-	 *    isOrdered = "false"
-	 *    isUnique = "false"
-	 *    isNavigable = "true"
-	 *
- *
- * 
-	 */	
-	public com.mycompany.equipment.Port port_0 = null;
-	
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/Equipment-model/tigerstripe.xml b/samples/EclipseSummit08/Equipment-model/tigerstripe.xml
deleted file mode 100644
index c4afc38..0000000
--- a/samples/EclipseSummit08/Equipment-model/tigerstripe.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tigerstripe version="1.1">
-<project name="">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>1.0</version>
-<description>Sample project for Eclipse Summit'08 presentation.&#13;See http://wiki.eclipse.org/TigerstripeAtEclipseSummit08 for more details.</description>
-<provider></provider>
-<property name="defaultArtifactPackage">com.mycompany</property>
-</project>
-<repositories>
-<repository baseDir=".">
-<includes>src/**/*.java</includes>
-</repository>
-</repositories>
-<plugins>
-<plugin disableLogging="false" enabled="true" groupId="Cisco Systems, Inc." logLevel="0" pluginId="ClassLevel-Generator(1.0)" version="1.0"/>
-</plugins>
-<dependencies/>
-<references>
-<reference path="common-model"/>
-</references>
-<facetReferences/>
-<advanced/>
-</tigerstripe>
diff --git a/samples/EclipseSummit08/InstanceLevel-Generator/.classpath b/samples/EclipseSummit08/InstanceLevel-Generator/.classpath
deleted file mode 100644
index c88af97..0000000
--- a/samples/EclipseSummit08/InstanceLevel-Generator/.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="var" path="Tigerstripe External API"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/samples/EclipseSummit08/InstanceLevel-Generator/.cvsignore b/samples/EclipseSummit08/InstanceLevel-Generator/.cvsignore
deleted file mode 100644
index 90b07e9..0000000
--- a/samples/EclipseSummit08/InstanceLevel-Generator/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-classes
diff --git a/samples/EclipseSummit08/InstanceLevel-Generator/.project b/samples/EclipseSummit08/InstanceLevel-Generator/.project
deleted file mode 100644
index 0bc29d6..0000000
--- a/samples/EclipseSummit08/InstanceLevel-Generator/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>InstanceLevel-Generator</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.m0GeneratorProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/samples/EclipseSummit08/InstanceLevel-Generator/m0-generator.xml b/samples/EclipseSummit08/InstanceLevel-Generator/m0-generator.xml
deleted file mode 100644
index c93618c..0000000
--- a/samples/EclipseSummit08/InstanceLevel-Generator/m0-generator.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<m0-generator>
-<project name="">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>1.0</version>
-<description></description>
-<provider></provider>
-<property name="defaultArtifactPackage">com.mycompany</property>
-</project>
-<pluginNature type="M0"/>
-<logger defautLevel="0" isEnabled="false" logPath="null.log" maxRoll="9"/>
-<globalProperties/>
-<globalRules>
-<rule description="" enabled="true" name="createXML" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<body outputFile="instances.xml" overwriteFiles="true" suppressFiles="true" template="templates/xml.vm"/>
-</rule>
-</globalRules>
-<classpathEntries/>
-<additionalFiles/>
-<advanced/>
-</m0-generator>
diff --git a/samples/EclipseSummit08/InstanceLevel-Generator/templates/xml.vm b/samples/EclipseSummit08/InstanceLevel-Generator/templates/xml.vm
deleted file mode 100644
index 14f33c6..0000000
--- a/samples/EclipseSummit08/InstanceLevel-Generator/templates/xml.vm
+++ /dev/null
@@ -1,17 +0,0 @@
-<root>
-#foreach( $cInstance in $classInstances )
-  <instance name="$cInstance.InstanceName" class="$cInstance.Artifact.FullyQualifiedName">
-#foreach( $variable in $cInstance.Variables )
-    <variable name="$variable.Name" value="$variable.Value"/>
-#end
-  </instance> 
-#end 
-
-#foreach( $association in $associationInstances )
-    <association name="$association.Name" class="$association.Artifact.FullyQualifiedName">
-      <aEnd name="$association.AEnd.InstanceName"/>
-      <zEnd name="$association.ZEnd.InstanceName"/>
-    </association>
-#end
- 
-</root>
diff --git a/samples/EclipseSummit08/base-defs/.classpath b/samples/EclipseSummit08/base-defs/.classpath
deleted file mode 100644
index 7735f35..0000000
--- a/samples/EclipseSummit08/base-defs/.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="var" path="PROFILE_ARTIFACTS_LIB"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/samples/EclipseSummit08/base-defs/.project b/samples/EclipseSummit08/base-defs/.project
deleted file mode 100644
index ec0816c..0000000
--- a/samples/EclipseSummit08/base-defs/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>base-defs</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.tigerstripeProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripeProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/samples/EclipseSummit08/base-defs/.settings/org.eclipse.core.resources.prefs b/samples/EclipseSummit08/base-defs/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 4c9db86..0000000
--- a/samples/EclipseSummit08/base-defs/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 31 11:36:11 PDT 2008
-eclipse.preferences.version=1
-encoding//src/com/mycompany/commonTypes/types.vwm=UTF-8
-encoding//src/com/mycompany/commonTypes/types.wvd=UTF-8
diff --git a/samples/EclipseSummit08/base-defs/src/com/.package b/samples/EclipseSummit08/base-defs/src/com/.package
deleted file mode 100644
index 1cfc044..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/.package
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-
-
-/**
- * 
- *
- * @tigerstripe.package
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class com
- {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/.package b/samples/EclipseSummit08/base-defs/src/com/mycompany/.package
deleted file mode 100644
index 8ac2b82..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/.package
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com;
-
-
-/**
- * 
- *
- * @tigerstripe.package
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class mycompany
- {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/.package b/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/.package
deleted file mode 100644
index c9d4222..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/.package
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany;
-
-
-/**
- * 
- *
- * @tigerstripe.package
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class commonTypes
- {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/AvailabilityStatusEnum.java b/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/AvailabilityStatusEnum.java
deleted file mode 100644
index 3d9598b..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/AvailabilityStatusEnum.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.commonTypes;
-
-
-/**
- * 
- *
- * @tigerstripe.enum
- *		isAbstract = "false"
- *      base-type="String"
- *      extensible="false"
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class AvailabilityStatusEnum
- {
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '"0"'
-     *  
-     *
-     * 
-     */
-    public final static String unknown = "0";
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '"1"'
-     *  
-     *
-     * 
-     */
-    public final static String available = "1";
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '"2"'
-     *  
-     *
-     * 
-     */
-    public final static String underRepair = "2";
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/IPAddress.java b/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/IPAddress.java
deleted file mode 100644
index 2cb7324..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/IPAddress.java
+++ /dev/null
@@ -1,64 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.commonTypes;
-
-
-/**
- * A default - very simplistic - IPAdress complex type definition.
- *
- * @tigerstripe.datatype
- *		isAbstract = "false"
- *      isSingleExtensionType="false"
- *      isSessionFactoryMethods="false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("
- *      generate = "true"
- * * 
- */
-public abstract class IPAddress
- {
-
-
-
-    /**
-     * 
-     * @tigerstripe.field 
-     *  isOptional = "false"
-     *  isReadOnly = "false"
-     *  isOrdered = "false"
-     *  isUnique = "true"
-     *  typeMultiplicity = "1"
-     *   ref-by = "value"
-     *
-     *
-     * 
-     */
-	public String addressString;
-
-
-    /**
-     * 
-     * @tigerstripe.field 
-     *  isOptional = "false"
-     *  isReadOnly = "false"
-     *  isOrdered = "false"
-     *  isUnique = "true"
-     *  typeMultiplicity = "1"
-     *   ref-by = "value"
-     *
-     *
-     * 
-     */
-	public boolean isIPv6Address;
-
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/UnitsEnum.java b/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/UnitsEnum.java
deleted file mode 100644
index 81bbd1f..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/UnitsEnum.java
+++ /dev/null
@@ -1,491 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.3.0.v200806301337_incubation
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany.commonTypes;
-
-
-/**
- * An enumeration used to define the units of measure for a given attribute value (e.g., Bits, Bytes, Seconds, Minutes).
- *
- * @tigerstripe.enum
- *		isAbstract = "false"
- *      base-type="int"
- *      extensible="false"
- * @tigerstripe.interface package = "com.mycompany"
- *      generate = "true"
- * * 
- */
-public abstract class UnitsEnum
- {
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '0'
-     *  
-     *
-     * 
-     */
-    public final static int Bits = 0;
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '1'
-     *  
-     *
-     * 
-     */
-    public final static int Bytes = 1;
-
-
-    /**
-     * time
-     * @tigerstripe.label
-     *  value = '2'
-     *  
-     *
-     * 
-     */
-    public final static int Seconds = 2;
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '3'
-     *  
-     *
-     * 
-     */
-    public final static int Characters = 3;
-
-
-    /**
-     * rate of information flow
-     * @tigerstripe.label
-     *  value = '4'
-     *  
-     *
-     * 
-     */
-    public final static int Bits_Per_Second = 4;
-
-
-    /**
-     * time
-     * @tigerstripe.label
-     *  value = '5'
-     *  
-     *
-     * 
-     */
-    public final static int Minutes = 5;
-
-
-    /**
-     * angle
-     * @tigerstripe.label
-     *  value = '6'
-     *  
-     *
-     * 
-     */
-    public final static int Degrees = 6;
-
-
-    /**
-     * temperature
-     * @tigerstripe.label
-     *  value = '7'
-     *  
-     *
-     * 
-     */
-    public final static int tempCentigrade = 7;
-
-
-    /**
-     * temperature
-     * @tigerstripe.label
-     *  value = '8'
-     *  
-     *
-     * 
-     */
-    public final static int tempFahrenheit = 8;
-
-
-    /**
-     * frequency
-     * @tigerstripe.label
-     *  value = '9'
-     *  
-     *
-     * 
-     */
-    public final static int Hertz = 9;
-
-
-    /**
-     * length
-     * @tigerstripe.label
-     *  value = '10'
-     *  
-     *
-     * 
-     */
-    public final static int Meters = 10;
-
-
-    /**
-     * length
-     * @tigerstripe.label
-     *  value = '11'
-     *  
-     *
-     * 
-     */
-    public final static int MilliMeters = 11;
-
-
-    /**
-     * current
-     * @tigerstripe.label
-     *  value = '12'
-     *  
-     *
-     * 
-     */
-    public final static int MilliAmps = 12;
-
-
-    /**
-     * voltage
-     * @tigerstripe.label
-     *  value = '13'
-     *  
-     *
-     * 
-     */
-    public final static int MilliVolts = 13;
-
-
-    /**
-     * power
-     * @tigerstripe.label
-     *  value = '14'
-     *  
-     *
-     * 
-     */
-    public final static int Watts = 14;
-
-
-    /**
-     * energy
-     * @tigerstripe.label
-     *  value = '15'
-     *  
-     *
-     * 
-     */
-    public final static int Watt_Hours = 15;
-
-
-    /**
-     * dimensionless ratio
-     * @tigerstripe.label
-     *  value = '16'
-     *  
-     *
-     * 
-     */
-    public final static int Percentage = 16;
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '17'
-     *  
-     *
-     * 
-     */
-    public final static int Cells = 17;
-
-
-    /**
-     * rate of information flow
-     * @tigerstripe.label
-     *  value = '18'
-     *  
-     *
-     * 
-     */
-    public final static int Cells_Per_Second = 18;
-
-
-    /**
-     * time
-     * @tigerstripe.label
-     *  value = '19'
-     *  
-     *
-     * 
-     */
-    public final static int Tenths_Of_MicroSeconds = 19;
-
-
-    /**
-     * length
-     * @tigerstripe.label
-     *  value = '20'
-     *  
-     *
-     * 
-     */
-    public final static int Inches = 20;
-
-
-    /**
-     * power ratio
-     * @tigerstripe.label
-     *  value = '21'
-     *  
-     *
-     * 
-     */
-    public final static int Decibels = 21;
-
-
-    /**
-     * dimensionless ratio
-     * @tigerstripe.label
-     *  value = '22'
-     *  
-     *
-     * 
-     */
-    public final static int Parts_Per_Million = 22;
-
-
-    /**
-     * angle
-     * @tigerstripe.label
-     *  value = '23'
-     *  
-     *
-     * 
-     */
-    public final static int Radians = 23;
-
-
-    /**
-     * pressure
-     * @tigerstripe.label
-     *  value = '24'
-     *  
-     *
-     * 
-     */
-    public final static int mmHg = 24;
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '25'
-     *  
-     *
-     * 
-     */
-    public final static int Packets = 25;
-
-
-    /**
-     * rate of information flow
-     * @tigerstripe.label
-     *  value = '26'
-     *  
-     *
-     * 
-     */
-    public final static int Packets_Per_Second = 26;
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '27'
-     *  
-     *
-     * 
-     */
-    public final static int Percentage_Of_RawBandwidth = 27;
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '28'
-     *  
-     *
-     * 
-     */
-    public final static int Percentage_Of_RemainingBandwidth = 28;
-
-
-    /**
-     * rate of information flow
-     * @tigerstripe.label
-     *  value = '29'
-     *  
-     *
-     * 
-     */
-    public final static int Bytes_Per_Second = 29;
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '30'
-     *  
-     *
-     * 
-     */
-    public final static int ElementCount = 30;
-
-
-    /**
-     * length
-     * @tigerstripe.label
-     *  value = '31'
-     *  
-     *
-     * 
-     */
-    public final static int centimeters = 31;
-
-
-    /**
-     * 
-     * @tigerstripe.label
-     *  value = '32'
-     *  
-     *
-     * 
-     */
-    public final static int dBm_Per_Hz = 32;
-
-
-    /**
-     * rate of information flow
-     * @tigerstripe.label
-     *  value = '33'
-     *  
-     *
-     * 
-     */
-    public final static int kilobits_Per_Second = 33;
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '34'
-     *  
-     *
-     * 
-     */
-    public final static int kiloBytes = 34;
-
-
-    /**
-     * rate of information flow
-     * @tigerstripe.label
-     *  value = '35'
-     *  
-     *
-     * 
-     */
-    public final static int megabits_Per_Second = 35;
-
-
-    /**
-     * amount of information
-     * @tigerstripe.label
-     *  value = '36'
-     *  
-     *
-     * 
-     */
-    public final static int megaBytes = 36;
-
-
-    /**
-     * frequency
-     * @tigerstripe.label
-     *  value = '37'
-     *  
-     *
-     * 
-     */
-    public final static int megaHertz = 37;
-
-
-    /**
-     * time
-     * @tigerstripe.label
-     *  value = '38'
-     *  
-     *
-     * 
-     */
-    public final static int milliseconds = 38;
-
-
-    /**
-     * weight (mass)
-     * @tigerstripe.label
-     *  value = '39'
-     *  
-     *
-     * 
-     */
-    public final static int kilograms = 39;
-
-
-    /**
-     * weight (mass)
-     * @tigerstripe.label
-     *  value = '40'
-     *  
-     *
-     * 
-     */
-    public final static int pounds = 40;
-
-
-    /**
-     * length
-     * @tigerstripe.label
-     *  value = '41'
-     *  
-     *
-     * 
-     */
-    public final static int feet = 41;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/types.vwm b/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/types.vwm
deleted file mode 100644
index 44688f8..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/types.vwm
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<null:Map xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:null="null" basePackage="com.mycompany.commonTypes">
-  <artifacts xsi:type="null:Enumeration" name="AvailabilityStatusEnum" package="com.mycompany.commonTypes" baseType="String">
-    <literals name="unknown" type="String" value="&quot;0&quot;"/>
-    <literals name="available" type="String" value="&quot;1&quot;"/>
-    <literals name="underRepair" type="String" value="&quot;2&quot;"/>
-  </artifacts>
-  <artifacts xsi:type="null:DatatypeArtifact" name="IPAddress" package="com.mycompany.commonTypes">
-    <attributes name="addressString" type="String" isUnique="true"/>
-    <attributes name="isIPv6Address" type="boolean" isUnique="true"/>
-  </artifacts>
-  <artifacts xsi:type="null:Enumeration" name="UnitsEnum" package="com.mycompany.commonTypes" baseType="int">
-    <literals name="Bits" type="int" value="0"/>
-    <literals name="Bytes" type="int" value="1"/>
-    <literals name="Seconds" type="int" value="2"/>
-    <literals name="Characters" type="int" value="3"/>
-    <literals name="Bits_Per_Second" type="int" value="4"/>
-    <literals name="Minutes" type="int" value="5"/>
-    <literals name="Degrees" type="int" value="6"/>
-    <literals name="tempCentigrade" type="int" value="7"/>
-    <literals name="tempFahrenheit" type="int" value="8"/>
-    <literals name="Hertz" type="int" value="9"/>
-    <literals name="Meters" type="int" value="10"/>
-    <literals name="MilliMeters" type="int" value="11"/>
-    <literals name="MilliAmps" type="int" value="12"/>
-    <literals name="MilliVolts" type="int" value="13"/>
-    <literals name="Watts" type="int" value="14"/>
-    <literals name="Watt_Hours" type="int" value="15"/>
-    <literals name="Percentage" type="int" value="16"/>
-    <literals name="Cells" type="int" value="17"/>
-    <literals name="Cells_Per_Second" type="int" value="18"/>
-    <literals name="Tenths_Of_MicroSeconds" type="int" value="19"/>
-    <literals name="Inches" type="int" value="20"/>
-    <literals name="Decibels" type="int" value="21"/>
-    <literals name="Parts_Per_Million" type="int" value="22"/>
-    <literals name="Radians" type="int" value="23"/>
-    <literals name="mmHg" type="int" value="24"/>
-    <literals name="Packets" type="int" value="25"/>
-    <literals name="Packets_Per_Second" type="int" value="26"/>
-    <literals name="Percentage_Of_RawBandwidth" type="int" value="27"/>
-    <literals name="Percentage_Of_RemainingBandwidth" type="int" value="28"/>
-    <literals name="Bytes_Per_Second" type="int" value="29"/>
-    <literals name="ElementCount" type="int" value="30"/>
-    <literals name="centimeters" type="int" value="31"/>
-    <literals name="dBm_Per_Hz" type="int" value="32"/>
-    <literals name="kilobits_Per_Second" type="int" value="33"/>
-    <literals name="kiloBytes" type="int" value="34"/>
-    <literals name="megabits_Per_Second" type="int" value="35"/>
-    <literals name="megaBytes" type="int" value="36"/>
-    <literals name="megaHertz" type="int" value="37"/>
-    <literals name="milliseconds" type="int" value="38"/>
-    <literals name="kilograms" type="int" value="39"/>
-    <literals name="pounds" type="int" value="40"/>
-    <literals name="feet" type="int" value="41"/>
-  </artifacts>
-</null:Map>
diff --git a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/types.wvd b/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/types.wvd
deleted file mode 100644
index 525feef..0000000
--- a/samples/EclipseSummit08/base-defs/src/com/mycompany/commonTypes/types.wvd
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.1/notation" xmlns:null="null" xmi:id="_ymxZUKd6Ed2Hdqs9bvwh_w" type="Tigerstripe" name="types.wvd" measurementUnit="Pixel">
-  <children xmi:type="notation:Node" xmi:id="_y8nGcKd6Ed2Hdqs9bvwh_w" type="1006">
-    <children xmi:type="notation:Node" xmi:id="_y8pisKd6Ed2Hdqs9bvwh_w" type="4011"/>
-    <children xmi:type="notation:Node" xmi:id="_y8qJwKd6Ed2Hdqs9bvwh_w" type="4012"/>
-    <children xmi:type="notation:Node" xmi:id="_y8smAKd6Ed2Hdqs9bvwh_w" type="4013"/>
-    <children xmi:type="notation:Node" xmi:id="_y8smAad6Ed2Hdqs9bvwh_w" type="5008">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_y8smAqd6Ed2Hdqs9bvwh_w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_y8smA6d6Ed2Hdqs9bvwh_w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_y8smBKd6Ed2Hdqs9bvwh_w"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_y8nGcad6Ed2Hdqs9bvwh_w" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_y8nGcqd6Ed2Hdqs9bvwh_w"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_y8nGc6d6Ed2Hdqs9bvwh_w" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_y8nGdKd6Ed2Hdqs9bvwh_w"/>
-    <element xmi:type="null:Enumeration" href="types.vwm#//@artifacts.0"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_y8nGdad6Ed2Hdqs9bvwh_w" x="45" y="72"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_zOrG0Kd6Ed2Hdqs9bvwh_w" type="1005">
-    <children xmi:type="notation:Node" xmi:id="_zO5wUKd6Ed2Hdqs9bvwh_w" type="4009"/>
-    <children xmi:type="notation:Node" xmi:id="_zO6XYKd6Ed2Hdqs9bvwh_w" type="4010"/>
-    <children xmi:type="notation:Node" xmi:id="_zPCTMKd6Ed2Hdqs9bvwh_w" type="5006">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zPCTMad6Ed2Hdqs9bvwh_w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zPCTMqd6Ed2Hdqs9bvwh_w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zPCTM6d6Ed2Hdqs9bvwh_w"/>
-    </children>
-    <children xmi:type="notation:Node" xmi:id="_zPDhUKd6Ed2Hdqs9bvwh_w" type="5007">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_zPDhUad6Ed2Hdqs9bvwh_w"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_zPDhUqd6Ed2Hdqs9bvwh_w"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_zPDhU6d6Ed2Hdqs9bvwh_w"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_zOrG0ad6Ed2Hdqs9bvwh_w" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_zOrG0qd6Ed2Hdqs9bvwh_w"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_zOrG06d6Ed2Hdqs9bvwh_w" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_zOrG1Kd6Ed2Hdqs9bvwh_w"/>
-    <element xmi:type="null:DatatypeArtifact" href="types.vwm#//@artifacts.1"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_zOrG1ad6Ed2Hdqs9bvwh_w" x="45" y="180"/>
-  </children>
-  <children xmi:type="notation:Node" xmi:id="_tELeAKd7Ed2RvrOL3boyzg" type="1006">
-    <children xmi:type="notation:Node" xmi:id="_tEOhUKd7Ed2RvrOL3boyzg" type="4011"/>
-    <children xmi:type="notation:Node" xmi:id="_tEPIYKd7Ed2RvrOL3boyzg" type="4012"/>
-    <children xmi:type="notation:Node" xmi:id="_tEPIYad7Ed2RvrOL3boyzg" type="4013"/>
-    <children xmi:type="notation:Node" xmi:id="_tEPvcKd7Ed2RvrOL3boyzg" type="5008">
-      <styles xmi:type="notation:DrawerStyle" xmi:id="_tEPvcad7Ed2RvrOL3boyzg"/>
-      <styles xmi:type="notation:SortingStyle" xmi:id="_tEPvcqd7Ed2RvrOL3boyzg"/>
-      <styles xmi:type="notation:FilteringStyle" xmi:id="_tEPvc6d7Ed2RvrOL3boyzg"/>
-    </children>
-    <styles xmi:type="notation:FontStyle" xmi:id="_tELeAad7Ed2RvrOL3boyzg" fontName="Arial"/>
-    <styles xmi:type="notation:DescriptionStyle" xmi:id="_tELeAqd7Ed2RvrOL3boyzg"/>
-    <styles xmi:type="notation:FillStyle" xmi:id="_tELeA6d7Ed2RvrOL3boyzg" fillColor="13825530"/>
-    <styles xmi:type="notation:LineStyle" xmi:id="_tELeBKd7Ed2RvrOL3boyzg"/>
-    <element xmi:type="null:Enumeration" href="types.vwm#//@artifacts.2"/>
-    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_tELeBad7Ed2RvrOL3boyzg" x="360" y="45"/>
-  </children>
-  <styles xmi:type="notation:PageStyle" xmi:id="_ymxZUad6Ed2Hdqs9bvwh_w"/>
-  <styles xmi:type="notation:GuideStyle" xmi:id="_ymxZUqd6Ed2Hdqs9bvwh_w"/>
-  <styles xmi:type="notation:DescriptionStyle" xmi:id="_ymxZU6d6Ed2Hdqs9bvwh_w"/>
-  <element xmi:type="null:Map" href="types.vwm#/"/>
-</notation:Diagram>
diff --git a/samples/EclipseSummit08/base-defs/tigerstripe.xml b/samples/EclipseSummit08/base-defs/tigerstripe.xml
deleted file mode 100644
index 2d4459c..0000000
--- a/samples/EclipseSummit08/base-defs/tigerstripe.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<tigerstripe version="1.1">
-<project name="">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>1.0</version>
-<description>This Tigerstripe model contains base Enum/Datatype definitions for the EclipseSummit08 demo.&#13;See http://wiki.eclipse.org/TigerstripeAtEclipseSummit08 for more information.</description>
-<provider></provider>
-<property name="defaultArtifactPackage">com.mycompany</property>
-</project>
-<repositories>
-<repository baseDir=".">
-<includes>src/**/*.java</includes>
-</repository>
-</repositories>
-<plugins/>
-<dependencies/>
-<references/>
-<facetReferences/>
-<advanced/>
-</tigerstripe>
diff --git a/samples/EclipseSummit08/common-model/.classpath b/samples/EclipseSummit08/common-model/.classpath
deleted file mode 100644
index 15b6aef..0000000
--- a/samples/EclipseSummit08/common-model/.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="PROFILE_ARTIFACTS_LIB"/>
-	<classpathentry exported="true" kind="lib" path="base-defs.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/samples/EclipseSummit08/common-model/.project b/samples/EclipseSummit08/common-model/.project
deleted file mode 100644
index f11bba4..0000000
--- a/samples/EclipseSummit08/common-model/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>common-model</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.tigerstripeProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripeProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/samples/EclipseSummit08/common-model/.settings/org.eclipse.core.resources.prefs b/samples/EclipseSummit08/common-model/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index f1b4392..0000000
--- a/samples/EclipseSummit08/common-model/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,4 +0,0 @@
-#Fri Oct 31 11:20:59 PDT 2008
-eclipse.preferences.version=1
-encoding//src/common.vwm=UTF-8
-encoding//src/common.wvd=UTF-8
diff --git a/samples/EclipseSummit08/common-model/annotations/org.eclipse.tigerstripe.annotation.example.ann b/samples/EclipseSummit08/common-model/annotations/org.eclipse.tigerstripe.annotation.example.ann
deleted file mode 100644
index 20535cb..0000000
--- a/samples/EclipseSummit08/common-model/annotations/org.eclipse.tigerstripe.annotation.example.ann
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:dn="http:///org/eclipse/tigerstripe/annotation/example/designNotes.ecore" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.tigerstripe.annotation="http:///org/eclipse/tigerstripe/annotation.ecore">
-  <ecoreDefinition>
-    <ecore:EPackage name="designNotes" nsURI="http:///org/eclipse/tigerstripe/annotation/example/designNotes.ecore" nsPrefix="dn">
-      <eClassifiers xsi:type="ecore:EClass" name="Note">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="Text">
-          <eAnnotations source="org.eclipse.tigerstripe.annotation">
-            <details key="multiline" value="true"/>
-          </eAnnotations>
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="TODO">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="hack">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </ecore:EPackage>
-  </ecoreDefinition>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/common-model/com.mycompany.Location" id="_75yYUKtVEd2Czva3v3Wzmg">
-    <content xsi:type="dn:Note" Text="This is a long note."/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/common-model/com.mycompany.Location" id="_AlDNkKtWEd2Czva3v3Wzmg">
-    <content xsi:type="dn:TODO" summary="This a short summary"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-</xmi:XMI>
diff --git a/samples/EclipseSummit08/common-model/annotations/org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.ann b/samples/EclipseSummit08/common-model/annotations/org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.ann
deleted file mode 100644
index 11cf1fd..0000000
--- a/samples/EclipseSummit08/common-model/annotations/org.eclipse.tigerstripe.samples.eclipseSummit08.annotations.ann
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="ASCII"?>
-<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:d="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore" xmlns:dn="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:org.eclipse.tigerstripe.annotation="http:///org/eclipse/tigerstripe/annotation.ecore">
-  <ecoreDefinition>
-    <ecore:EPackage name="designNotes" nsURI="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/designNotes.ecore" nsPrefix="dn">
-      <eClassifiers xsi:type="ecore:EClass" name="Note">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="Text">
-          <eAnnotations source="org.eclipse.tigerstripe.annotation">
-            <details key="multiline" value="true"/>
-          </eAnnotations>
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="TODO">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="hack">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="summary">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </ecore:EPackage>
-    <ecore:EPackage name="documentation" nsURI="http:///org/eclipse/tigerstripe/samples/eclipseSummit08/annotations/documentation.ecore" nsPrefix="d">
-      <eClassifiers xsi:type="ecore:EClass" name="Documentation">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="author">
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="content">
-          <eAnnotations source="org.eclipse.tigerstripe.annotation">
-            <details key="editor" value="org.eclipse.wst.html.core.htmlsource.source"/>
-          </eAnnotations>
-          <eType xsi:type="ecore:EDataType" href="http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eStructuralFeatures>
-      </eClassifiers>
-    </ecore:EPackage>
-  </ecoreDefinition>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/common-model/com.mycompany.Location" id="_jgGIQatjEd2lYdGdV4OSHA">
-    <content xsi:type="dn:Note"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/common-model/com.mycompany.Resource" id="_R1DNUKwoEd2RXa_ep6lxPw">
-    <content xsi:type="d:Documentation"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-  <org.eclipse.tigerstripe.annotation:Annotation uri="tigerstripe:/common-model/com.mycompany.Resource" id="_LAMmoKwuEd2z2tbrb1IElA">
-    <content xsi:type="dn:Note"/>
-  </org.eclipse.tigerstripe.annotation:Annotation>
-</xmi:XMI>
diff --git a/samples/EclipseSummit08/common-model/base-defs.zip b/samples/EclipseSummit08/common-model/base-defs.zip
deleted file mode 100644
index 41b45e3..0000000
--- a/samples/EclipseSummit08/common-model/base-defs.zip
+++ /dev/null
Binary files differ
diff --git a/samples/EclipseSummit08/common-model/src/com/.package b/samples/EclipseSummit08/common-model/src/com/.package
deleted file mode 100644
index 1cfc044..0000000
--- a/samples/EclipseSummit08/common-model/src/com/.package
+++ /dev/null
@@ -1,30 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-
-
-/**
- * 
- *
- * @tigerstripe.package
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class com
- {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/common-model/src/com/mycompany/.package b/samples/EclipseSummit08/common-model/src/com/mycompany/.package
deleted file mode 100644
index 8ac2b82..0000000
--- a/samples/EclipseSummit08/common-model/src/com/mycompany/.package
+++ /dev/null
@@ -1,31 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com;
-
-
-/**
- * 
- *
- * @tigerstripe.package
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * * 
- */
-public abstract class mycompany
- {
-	
-	// not important since this class will never be serialized.
-	private static final long serialVersionUID = -1L;
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/common-model/src/com/mycompany/Location.java b/samples/EclipseSummit08/common-model/src/com/mycompany/Location.java
deleted file mode 100644
index ca552a8..0000000
--- a/samples/EclipseSummit08/common-model/src/com/mycompany/Location.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany;
-
-
-/**
- * 
- *
- * @tigerstripe.managedEntity primary-key="$artifact.IStandardSpecifics.PrimaryKey"
- *      extensibilityType="multi"
- *      isSessionFactoryMethods="false"
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.key-interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * @tigerstripe.value package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.create"
- *   byAutoNaming = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simple = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.get"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   simpleByKey = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.set"
- *   simple = "true"
- *   byTemplates = "false"
- *   byTemplatesBestEffort = "false"
- *   byTemplate = "false"
- *   byTemplateBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *
- * @tigerstripe.property ts.id="ossj.entity.remove"
- *   byTemplatesBestEffort = "false"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simpleByKey = "true"
- *   byTemplateBestEffort = "false"
- *
- * 
- */
-public abstract class Location
-  extends com.mycompany.Top
- {
-
-
-
-
-}
\ No newline at end of file
diff --git a/samples/EclipseSummit08/common-model/src/com/mycompany/Party.java b/samples/EclipseSummit08/common-model/src/com/mycompany/Party.java
deleted file mode 100644
index 80087f8..0000000
--- a/samples/EclipseSummit08/common-model/src/com/mycompany/Party.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*******************************************************************************
- * Created with Tigerstripe(tm) Workbench v.0.4.2.qualifier
- * 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
- *
- * DO NOT EDIT THIS FILE - Created with Tigerstripe(tm) Workbench
- *
- *******************************************************************************/
-package com.mycompany;
-
-
-/**
- * 
- *
- * @tigerstripe.managedEntity primary-key="$artifact.IStandardSpecifics.PrimaryKey"
- *      extensibilityType="multi"
- *      isSessionFactoryMethods="false"
- *		isAbstract = "false"
- *		implements = ""
- * @tigerstripe.key-interface package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- * @tigerstripe.value package = "$artifact.IStandardSpecifics.InterfaceProperties.get("package")"
- *      generate = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.create"
- *   byAutoNaming = "false"
- *   bulkBestEffort = "false"
- *   bulkAtomic = "false"
- *   bulkAtomicByKeys = "false"
- *   bulkBestEffortByKeys = "false"
- *   simple = "true"
- *
- * @tigerstripe.property ts.id="ossj.entity.get"
- *   byTemplates = "false"
- *   byTemplate = "false"
- *   bulkAtomicByKeys =