This commit was manufactured by cvs2svn to create tag 'OLD_TS_EXPLORER'.
diff --git a/.project b/.project
deleted file mode 100644
index 12e4b02..0000000
--- a/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tigerstripe-overlay</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/build.sh b/build.sh
deleted file mode 100644
index c08ae3a..0000000
--- a/build.sh
+++ /dev/null
@@ -1,94 +0,0 @@
-#!/bin/bash
-
-DATE=`date`
-
-#MAVEN_OPTS=-Xmx1024m -DsocksProxyHost=proxy-sjc-1.cisco.com -DsocksProxyPort=1080
-
-MAVEN=tycho-distribution-0.4.0-DEV-3023
-MAVEN=tycho-distribution-0.4.0-DEV-3076
-#MAVEN=tycho-distribution-0.4.0-DEV-3170
-
-x=${MAVEN_TEST_SKIP:=false}
-export MAVEN_OPTS=-Xmx1024m
-
-if [ ! -z "${EXECUTOR_NUMBER}" ]; then
-    export DISPLAY=localhost:$((1+${EXECUTOR_NUMBER}%4)).0
-fi
-
-set -x
-
-env|sort
-pwd
-
-# ------------------------------------------------------------------------------
-rebuildTarget()
-{
-    rm -rf target
-    mkdir -p target
-
-    (cd target; tar xjf /auto/surf-tp/tools/maven/$MAVEN-bin.tar.bz2; cd ..)
-
-    rsync -a --delete features target/ || exit 1
-    rsync -a --delete plugins target/ || exit 1
-    rsync -a --delete releng target/ || exit 1
-    rsync -a --delete pom.xml target/ || exit 1
-
-#    SETTINGS=target/$MAVEN/conf/settings.xml
-#    mv $SETTINGS $SETTINGS.org
-#    sed '/<settings>/ a\
-#\
-#  <proxies>\
-#   <proxy>\
-#      <active>true</active>\
-#      <protocol>http</protocol>\
-#      <host>proxy-sjc-1.cisco.com</host>\
-#      <port>80</port>\
-#      <nonProxyHosts>*.cisco.com|localhost</nonProxyHosts>\
-#    </proxy>\
-#  </proxies>\
-#' $SETTINGS.org >$SETTINGS
-}
-
-# ------------------------------------------------------------------------------
-if [ -d target ]; then
-    if find . -type d -name org.eclipse.tigerstripe -maxdepth 1 -cnewer target 2>/dev/null | grep -q org.eclipse.tigerstripe ; then 
-        echo "[info] newer Tigerstripe codebase found: rebuilding target hierarchy"
-        rebuildTarget
-    fi
-else
-    echo "[info] non-existing target hierarchy: rebuilding"
-    rebuildTarget
-fi
-
-# ------------------------------------------------------------------------------
-rsync -av --delete features target/ || exit 1
-rsync -av --delete plugins target/ || exit 1
-rsync -av --delete releng target/ || exit 1
-rsync -av  pom.xml target/ || exit 1
-
-# ------------------------------------------------------------------------------ 
-if [ ! -z "$BUILD_VERSION" ]; then
-	chmod +x ./patch_version.sh
-    ./patch_version.sh . target $BUILD_VERSION
-fi
-
-# Run pre-build script
-chmod +x ./pre-build.sh
-./pre-build.sh
-
-#./$MAVEN/bin/mvn --fail-at-end -Dtycho.showEclipseLog=true  -Dosgi.ws=cocoa -Dmaven.test.skip=$MAVEN_TEST_SKIP install -e -B
-
-(cd target/
- find * -type d -name target -exec rm -rf {} \; 2>/dev/null
- ./$MAVEN/bin/mvn \
-    -e -B \
-    --fail-at-end \
-    -Dtycho.showEclipseLog=true \
-    -Dmaven.test.skip=$MAVEN_TEST_SKIP \
-    install
- cd ..
- cp -rf target/releng/org.eclipse.tigerstripe.update-site/target/site target
- rm -rf /auto/tigerstripe/xmpsdk/tigerstripe-test-p2/*
- cp -rf target/releng/org.eclipse.tigerstripe.update-site/target/site/* /auto/tigerstripe/xmpsdk/tigerstripe-test-p2
-)
-
diff --git a/features/org.eclipse.tigerstripe.annotation.core.test-feature/.project b/features/org.eclipse.tigerstripe.annotation.core.test-feature/.project
deleted file mode 100644
index 66401e0..0000000
--- a/features/org.eclipse.tigerstripe.annotation.core.test-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotation.core.test-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.annotation.core.test-feature/build.properties b/features/org.eclipse.tigerstripe.annotation.core.test-feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.tigerstripe.annotation.core.test-feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.tigerstripe.annotation.core.test-feature/feature.xml b/features/org.eclipse.tigerstripe.annotation.core.test-feature/feature.xml
deleted file mode 100644
index c0257b6..0000000
--- a/features/org.eclipse.tigerstripe.annotation.core.test-feature/feature.xml
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.annotation.core.test_feature"
-      label="Annotation Core Test Feature"
-      version="0.0.0"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.eclipse.org/tigerstripe">
-      Test feature for Core Annotations.
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.tigerstripe.annotation.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.core.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.java"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.java.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.java.ui.refactoring"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.ui.diagrams"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/.project b/features/org.eclipse.tigerstripe.annotation.feature/.project
deleted file mode 100644
index 0f9ca31..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotation.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/build.properties b/features/org.eclipse.tigerstripe.annotation.feature/build.properties
deleted file mode 100644
index 39b0777..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/epl-v10.html b/features/org.eclipse.tigerstripe.annotation.feature/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/feature.properties b/features/org.eclipse.tigerstripe.annotation.feature/feature.properties
deleted file mode 100644
index 0bf3758..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/feature.properties
+++ /dev/null
@@ -1,140 +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
-#
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Tigerstripe Annotation Framework (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Install this if you want to use the Tigerstripe Annotations Feature.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
-
-# "TigerstripeUpdateSiteName" property - label for the update site (on download1.eclipse.org)
-TigerstripeUpdateSiteName=Tigerstripe Updates (Incubation)
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/feature.xml b/features/org.eclipse.tigerstripe.annotation.feature/feature.xml
deleted file mode 100644
index 31be341..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/feature.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.annotation.feature"
-      label="%featureName"
-      version="0.0.0"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2008 Cisco Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="Tigerstripe Update Site (Incubation)" url="http://download.eclipse.org/technology/tigerstripe/updates"/>
-      <discovery label="Tigerstripe Website" url="http://www.eclipse.org/tigerstripe"/>
-      <discovery label="Tigerstripe Wiki" url="http://wiki.eclipse.org/Tigerstripe"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.resource"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.resource.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.espace.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.espace.resources"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.espace.resources.monitor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/license.html b/features/org.eclipse.tigerstripe.annotation.feature/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.tigerstripe.annotation.feature/pom.xml b/features/org.eclipse.tigerstripe.annotation.feature/pom.xml
deleted file mode 100644
index 390ea57..0000000
--- a/features/org.eclipse.tigerstripe.annotation.feature/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-
-  <parent>
-    <groupId>org.eclipse.tigerstripe</groupId>
-    <artifactId>org.eclipse.tigerstripe.features.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tigerstripe.annotation.feature</artifactId>
-  <packaging>eclipse-feature</packaging>
-  <name>features/o.e.t.annotation.feature</name>
-
-</project>
diff --git a/features/org.eclipse.tigerstripe.base.test-feature/.project b/features/org.eclipse.tigerstripe.base.test-feature/.project
deleted file mode 100644
index a46ac39..0000000
--- a/features/org.eclipse.tigerstripe.base.test-feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.base.test-feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.base.test-feature/build.properties b/features/org.eclipse.tigerstripe.base.test-feature/build.properties
deleted file mode 100644
index 64f93a9..0000000
--- a/features/org.eclipse.tigerstripe.base.test-feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.tigerstripe.base.test-feature/feature.xml b/features/org.eclipse.tigerstripe.base.test-feature/feature.xml
deleted file mode 100644
index 7a053e9..0000000
--- a/features/org.eclipse.tigerstripe.base.test-feature/feature.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.base.test_feature"
-      label="Test_feature Feature"
-      version="0.0.0"
-      provider-name="Eclipse.org">
-
-   <description url="http://www.example.com/description">
-      Test feature for org.eclipse.tigerstripe.base feature.
-   </description>
-
-   <copyright url="http://www.example.com/copyright">
-      [Enter Copyright Description here.]
-   </copyright>
-
-   <license url="http://www.example.com/license">
-      [Enter License Description here.]
-   </license>
-
-   <includes
-         id="org.eclipse.tigerstripe.base"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.base.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.core.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.base/.project b/features/org.eclipse.tigerstripe.base/.project
deleted file mode 100644
index dae3d4a..0000000
--- a/features/org.eclipse.tigerstripe.base/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.base</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.base/build.properties b/features/org.eclipse.tigerstripe.base/build.properties
deleted file mode 100644
index 39b0777..0000000
--- a/features/org.eclipse.tigerstripe.base/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
diff --git a/features/org.eclipse.tigerstripe.base/epl-v10.html b/features/org.eclipse.tigerstripe.base/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.tigerstripe.base/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.tigerstripe.base/feature.properties b/features/org.eclipse.tigerstripe.base/feature.properties
deleted file mode 100644
index 34fc292..0000000
--- a/features/org.eclipse.tigerstripe.base/feature.properties
+++ /dev/null
@@ -1,140 +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
-#
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Tigerstripe Core (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Install this if you want to use the Tigerstripe Core without the UI or diagrams fonctionalities.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
-
-# "TigerstripeUpdateSiteName" property - label for the update site (on download1.eclipse.org)
-TigerstripeUpdateSiteName=Tigerstripe Updates (Incubation)
diff --git a/features/org.eclipse.tigerstripe.base/feature.xml b/features/org.eclipse.tigerstripe.base/feature.xml
deleted file mode 100644
index 04054dc..0000000
--- a/features/org.eclipse.tigerstripe.base/feature.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.base"
-      label="%featureName"
-      version="0.0.0"
-      provider-name="%providerName">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2008 Cisco Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="Tigerstripe Update Site (Incubation)" url="http://download.eclipse.org/technology/tigerstripe/updates"/>
-      <discovery label="Tigerstripe Website" url="http://www.eclipse.org/tigerstripe"/>
-      <discovery label="Tigerstripe Wiki" url="http://wiki.eclipse.org/Tigerstripe"/>
-   </url>
-
-   <includes
-         id="org.eclipse.tigerstripe.annotation.feature"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.metamodel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.ts2project.router"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.tsmodel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.headless"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.help"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.repository.core"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.base/license.html b/features/org.eclipse.tigerstripe.base/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/features/org.eclipse.tigerstripe.base/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.tigerstripe.base/pom.xml b/features/org.eclipse.tigerstripe.base/pom.xml
deleted file mode 100644
index 90ffbd3..0000000
--- a/features/org.eclipse.tigerstripe.base/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-
-  <parent>
-    <groupId>org.eclipse.tigerstripe</groupId>
-    <artifactId>org.eclipse.tigerstripe.features.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tigerstripe.base</artifactId>
-  <packaging>eclipse-feature</packaging>
-  <name>features/o.e.t.base</name>
-
-</project>
diff --git a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/.project b/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/.project
deleted file mode 100644
index 8691ec9..0000000
--- a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.workbench.optional.buckminster.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/build.properties b/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/build.properties
deleted file mode 100644
index 39b0777..0000000
--- a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
diff --git a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/epl-v10.html b/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/feature.properties b/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/feature.properties
deleted file mode 100644
index 6dc7827..0000000
--- a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/feature.properties
+++ /dev/null
@@ -1,141 +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. - jistrawn
-#
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Tigerstripe Buckminster Support (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Install this feature if you want to enable Tigerstripe Buckminster support.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
-
-# "TigerstripeUpdateSiteName" property - label for the update site (on download1.eclipse.org)
-TigerstripeUpdateSiteName=Tigerstripe Updates (Incubation)
-
diff --git a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/feature.xml b/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/feature.xml
deleted file mode 100644
index 0ad4127..0000000
--- a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/feature.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.workbench.optional.buckminster.feature"
-      label="%featureName"
-      version="0.0.0"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2008 Cisco Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="Tigerstripe Update Site (Incubation)" url="http://download.eclipse.org/technology/tigerstripe/updates/site.xml"/>
-      <discovery label="Tigerstripe Website" url="http://www.eclipse.org/tigerstripe"/>
-      <discovery label="Tigerstripe Wiki" url="http://wiki.eclipse.org/Tigerstripe"/>
-   </url>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.optional.buckminster"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/license.html b/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/features/org.eclipse.tigerstripe.workbench.optional.buckminster.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.base.test.feature/.project b/features/org.eclipse.tigerstripe.workbench.ui.base.test.feature/.project
deleted file mode 100644
index 9476478..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.base.test.feature/.project
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.workbench.ui.base.test.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-	</buildSpec>
-	<natures>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/.project b/features/org.eclipse.tigerstripe.workbench.ui.test.feature/.project
deleted file mode 100644
index ec91060..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.workbench.ui.test.feature</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/build.properties b/features/org.eclipse.tigerstripe.workbench.ui.test.feature/build.properties
deleted file mode 100644
index 39b0777..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/build.properties
+++ /dev/null
@@ -1,4 +0,0 @@
-bin.includes = feature.xml,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/epl-v10.html b/features/org.eclipse.tigerstripe.workbench.ui.test.feature/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/feature.properties b/features/org.eclipse.tigerstripe.workbench.ui.test.feature/feature.properties
deleted file mode 100644
index 37a6000..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/feature.properties
+++ /dev/null
@@ -1,137 +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. - jistrawn
-#
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=Tigerstripe UI Test Feature (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=This feature is required to include the base ui unit tests in the automated build process.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/feature.xml b/features/org.eclipse.tigerstripe.workbench.ui.test.feature/feature.xml
deleted file mode 100644
index 94c1c4f..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/feature.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.workbench.ui.test.feature"
-      label="%featureName"
-      version="0.0.0"
-      provider-name="%providerName">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2008 Cisco Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <discovery label="Tigerstripe Website" url="http://www.eclipse.org/tigerstripe"/>
-      <discovery label="Tigerstripe Wiki" url="http://wiki.eclipse.org/Tigerstripe"/>
-   </url>
-
-   <includes
-         id="org.eclipse.tigerstripe.workbench"
-         version="0.0.0"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.base.test"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/license.html b/features/org.eclipse.tigerstripe.workbench.ui.test.feature/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/features/org.eclipse.tigerstripe.workbench.ui.test.feature/license.html
+++ /dev/null
@@ -1,79 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=iso-8859-1">
-<title>Eclipse.org Software User Agreement</title>
-</head>
-
-<body lang="EN-US" link=blue vlink=purple>
-<h2>Eclipse Foundation Software User Agreement</h2>
-<p>March 17, 2005</p>
-
-<h3>Usage Of Content</h3>
-
-<p>THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR OTHER MATERIALS FOR OPEN SOURCE PROJECTS
-   (COLLECTIVELY &quot;CONTENT&quot;).  USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS AGREEMENT AND/OR THE TERMS AND
-   CONDITIONS OF LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW.  BY USING THE CONTENT, YOU AGREE THAT YOUR USE
-   OF THE CONTENT IS GOVERNED BY THIS AGREEMENT AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR
-   NOTICES INDICATED OR REFERENCED BELOW.  IF YOU DO NOT AGREE TO THE TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND
-   CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED BELOW, THEN YOU MAY NOT USE THE CONTENT.</p>
-
-<h3>Applicable Licenses</h3>
-
-<p>Unless otherwise indicated, all Content made available by the Eclipse Foundation 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 provided with this Content and is also 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>Content includes, but is not limited to, source code, object code, documentation and other files maintained in the Eclipse.org CVS repository (&quot;Repository&quot;) in CVS
-   modules (&quot;Modules&quot;) and made available as downloadable archives (&quot;Downloads&quot;).</p>
-
-<ul>
-	<li>Content may be structured and packaged into modules to facilitate delivering, extending, and upgrading the Content.  Typical modules may include plug-ins (&quot;Plug-ins&quot;), plug-in fragments (&quot;Fragments&quot;), and features (&quot;Features&quot;).</li>
-	<li>Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java&trade; ARchive) in a directory named &quot;plugins&quot;.</li>
-	<li>A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.  Each Feature may be packaged as a sub-directory in a directory named &quot;features&quot;.  Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of the Plug-ins
-      and/or Fragments associated with that Feature.</li>
-	<li>Features may also include other Features (&quot;Included Features&quot;). Within a Feature, files named &quot;feature.xml&quot; may contain a list of the names and version numbers of Included Features.</li>
-</ul>
-
-<p>The terms and conditions governing Plug-ins and Fragments should be contained in files named &quot;about.html&quot; (&quot;Abouts&quot;). The terms and conditions governing Features and
-Included Features should be contained in files named &quot;license.html&quot; (&quot;Feature Licenses&quot;).  Abouts and Feature Licenses may be located in any directory of a Download or Module
-including, but not limited to the following locations:</p>
-
-<ul>
-	<li>The top-level (root) directory</li>
-	<li>Plug-in and Fragment directories</li>
-	<li>Inside Plug-ins and Fragments packaged as JARs</li>
-	<li>Sub-directories of the directory named &quot;src&quot; of certain Plug-ins</li>
-	<li>Feature directories</li>
-</ul>
-
-<p>Note: if a Feature made available by the Eclipse Foundation is installed using the Eclipse Update Manager, you must agree to a license (&quot;Feature Update License&quot;) during the
-installation process.  If the Feature contains Included Features, the Feature Update License should either provide you with the terms and conditions governing the Included Features or
-inform you where you can locate them.  Feature Update Licenses may be found in the &quot;license&quot; property of files named &quot;feature.properties&quot; found within a Feature.
-Such Abouts, Feature Licenses, and Feature Update Licenses contain the terms and conditions (or references to such terms and conditions) that govern your use of the associated Content in
-that directory.</p>
-
-<p>THE ABOUTS, FEATURE LICENSES, AND FEATURE UPDATE LICENSES MAY REFER TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.  SOME OF THESE
-OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):</p>
-
-<ul>
-	<li>Common Public License Version 1.0 (available at <a href="http://www.eclipse.org/legal/cpl-v10.html">http://www.eclipse.org/legal/cpl-v10.html</a>)</li>
-	<li>Apache Software License 1.1 (available at <a href="http://www.apache.org/licenses/LICENSE">http://www.apache.org/licenses/LICENSE</a>)</li>
-	<li>Apache Software License 2.0 (available at <a href="http://www.apache.org/licenses/LICENSE-2.0">http://www.apache.org/licenses/LICENSE-2.0</a>)</li>
-	<li>IBM Public License 1.0 (available at <a href="http://oss.software.ibm.com/developerworks/opensource/license10.html">http://oss.software.ibm.com/developerworks/opensource/license10.html</a>)</li>
-	<li>Metro Link Public License 1.00 (available at <a href="http://www.opengroup.org/openmotif/supporters/metrolink/license.html">http://www.opengroup.org/openmotif/supporters/metrolink/license.html</a>)</li>
-	<li>Mozilla Public License Version 1.1 (available at <a href="http://www.mozilla.org/MPL/MPL-1.1.html">http://www.mozilla.org/MPL/MPL-1.1.html</a>)</li>
-</ul>
-
-<p>IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR TO USE OF THE CONTENT.  If no About, Feature License, or Feature Update License is provided, please
-contact the Eclipse Foundation to determine what terms and conditions govern that particular Content.</p>
-
-<h3>Cryptography</h3>
-
-<p>Content may contain encryption software. The country in which you are currently may have restrictions on the import, possession, and use, and/or re-export to
-   another country, of encryption software. BEFORE using any encryption software, please check the country's laws, regulations and policies concerning the import,
-   possession, or use, and re-export of encryption software, to see if this is permitted.</p>
-
-<small>Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.</small>
-</body>
-</html>
diff --git a/features/org.eclipse.tigerstripe.workbench/.cvsignore b/features/org.eclipse.tigerstripe.workbench/.cvsignore
deleted file mode 100644
index c14487c..0000000
--- a/features/org.eclipse.tigerstripe.workbench/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-build.xml
diff --git a/features/org.eclipse.tigerstripe.workbench/.project b/features/org.eclipse.tigerstripe.workbench/.project
deleted file mode 100644
index 8624a14..0000000
--- a/features/org.eclipse.tigerstripe.workbench/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.workbench</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.pde.FeatureBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.FeatureNature</nature>
-	</natures>
-</projectDescription>
diff --git a/features/org.eclipse.tigerstripe.workbench/build.properties b/features/org.eclipse.tigerstripe.workbench/build.properties
deleted file mode 100644
index 0a34869..0000000
--- a/features/org.eclipse.tigerstripe.workbench/build.properties
+++ /dev/null
@@ -1,19 +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:
-#     E. Dillon (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
-
-bin.includes = feature.xml,\
-               eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               license.html
-src.includes = eclipse_update_120.jpg,\
-               epl-v10.html,\
-               feature.properties,\
-               feature.xml,\
-               license.html
diff --git a/features/org.eclipse.tigerstripe.workbench/category.xml b/features/org.eclipse.tigerstripe.workbench/category.xml
deleted file mode 100644
index c4cab86..0000000
--- a/features/org.eclipse.tigerstripe.workbench/category.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/org.eclipse.tigerstripe.workbench_0.0.0.jar" id="org.eclipse.tigerstripe.workbench" version="0.0.0">
-      <category name="org.eclipse.tigerstripe.category.workbench"/>
-   </feature>
-   <category-def name="org.eclipse.tigerstripe.category.workbench" label="Modeling Environment">
-      <description>
-         End-user Tigerstripe workbench.
-      </description>
-   </category-def>
-</site>
diff --git a/features/org.eclipse.tigerstripe.workbench/eclipse_update_120.jpg b/features/org.eclipse.tigerstripe.workbench/eclipse_update_120.jpg
deleted file mode 100644
index bfdf708..0000000
--- a/features/org.eclipse.tigerstripe.workbench/eclipse_update_120.jpg
+++ /dev/null
Binary files differ
diff --git a/features/org.eclipse.tigerstripe.workbench/epl-v10.html b/features/org.eclipse.tigerstripe.workbench/epl-v10.html
deleted file mode 100644
index cb1073a..0000000
--- a/features/org.eclipse.tigerstripe.workbench/epl-v10.html
+++ /dev/null
@@ -1,304 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN">
-<html xmlns:o="urn:schemas-microsoft-com:office:office"
-xmlns:w="urn:schemas-microsoft-com:office:word"
-xmlns="http://www.w3.org/TR/REC-html40">
-
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
-<link rel=File-List
-href="./Eclipse%20EPL%202003_11_10%20Final_files/filelist.xml">
-<title>Eclipse Public License - Version 1.0</title>
-<style>
-<!--
- /* Font Definitions */
-@font-face
-	{
-	panose-1:2 11 6 4 3 5 4 4 2 4;
-	mso-font-charset:0;
-	mso-font-pitch:variable;
-	mso-font-signature:553679495 -2147483648 8 0 66047 0;}
- /* Style Definitions */
-p.MsoNormal, li.MsoNormal, div.MsoNormal
-	{mso-style-parent:"";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p
-	{margin-right:0in;
-	mso-margin-top-alt:auto;
-	mso-margin-bottom-alt:auto;
-	margin-left:0in;
-	mso-pagination:widow-orphan;
-	font-size:12.0pt;
-	}
-p.BalloonText, li.BalloonText, div.BalloonText
-	{mso-style-name:"Balloon Text";
-	margin:0in;
-	margin-bottom:.0001pt;
-	mso-pagination:widow-orphan;
-	font-size:8.0pt;
-	
-	}
-@page Section1
-	{size:8.5in 11.0in;
-	margin:1.0in 1.25in 1.0in 1.25in;
-	mso-header-margin:.5in;
-	mso-footer-margin:.5in;
-	mso-paper-source:0;}
-div.Section1
-	{page:Section1;}
--->
-</style>
-</head>
-
-<body lang="EN-US" style='tab-interval:.5in'>
-
-<div class=Section1>
-
-<p align=center style='text-align:center'><b>Eclipse Public License - v 1.0</b>
-</p>
-
-<p><span style='font-size:10.0pt'>THE ACCOMPANYING PROGRAM IS PROVIDED UNDER
-THE TERMS OF THIS ECLIPSE PUBLIC LICENSE (&quot;AGREEMENT&quot;). ANY USE,
-REPRODUCTION OR DISTRIBUTION OF THE PROGRAM CONSTITUTES RECIPIENT'S ACCEPTANCE
-OF THIS AGREEMENT.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>1. DEFINITIONS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Contribution&quot; means:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-in the case of the initial Contributor, the initial code and documentation
-distributed under this Agreement, and<br clear=left>
-b) in the case of each subsequent Contributor:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-changes to the Program, and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-additions to the Program;</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>where
-such changes and/or additions to the Program originate from and are distributed
-by that particular Contributor. A Contribution 'originates' from a Contributor
-if it was added to the Program by such Contributor itself or anyone acting on
-such Contributor's behalf. Contributions do not include additions to the
-Program which: (i) are separate modules of software distributed in conjunction
-with the Program under their own license agreement, and (ii) are not derivative
-works of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Contributor&quot; means any person or
-entity that distributes the Program.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Licensed Patents &quot; mean patent
-claims licensable by a Contributor which are necessarily infringed by the use
-or sale of its Contribution alone or when combined with the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>&quot;Program&quot; means the Contributions
-distributed in accordance with this Agreement.</span> </p>
-
-<p><span style='font-size:10.0pt'>&quot;Recipient&quot; means anyone who
-receives the Program under this Agreement, including all Contributors.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>2. GRANT OF RIGHTS</span></b> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-Subject to the terms of this Agreement, each Contributor hereby grants Recipient
-a non-exclusive, worldwide, royalty-free copyright license to<span
-style='color:red'> </span>reproduce, prepare derivative works of, publicly
-display, publicly perform, distribute and sublicense the Contribution of such
-Contributor, if any, and such derivative works, in source code and object code
-form.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-Subject to the terms of this Agreement, each Contributor hereby grants
-Recipient a non-exclusive, worldwide,<span style='color:green'> </span>royalty-free
-patent license under Licensed Patents to make, use, sell, offer to sell, import
-and otherwise transfer the Contribution of such Contributor, if any, in source
-code and object code form. This patent license shall apply to the combination
-of the Contribution and the Program if, at the time the Contribution is added
-by the Contributor, such addition of the Contribution causes such combination
-to be covered by the Licensed Patents. The patent license shall not apply to
-any other combinations which include the Contribution. No hardware per se is
-licensed hereunder. </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>c)
-Recipient understands that although each Contributor grants the licenses to its
-Contributions set forth herein, no assurances are provided by any Contributor
-that the Program does not infringe the patent or other intellectual property
-rights of any other entity. Each Contributor disclaims any liability to Recipient
-for claims brought by any other entity based on infringement of intellectual
-property rights or otherwise. As a condition to exercising the rights and
-licenses granted hereunder, each Recipient hereby assumes sole responsibility
-to secure any other intellectual property rights needed, if any. For example,
-if a third party patent license is required to allow Recipient to distribute
-the Program, it is Recipient's responsibility to acquire that license before
-distributing the Program.</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>d)
-Each Contributor represents that to its knowledge it has sufficient copyright
-rights in its Contribution, if any, to grant the copyright license set forth in
-this Agreement. </span></p>
-
-<p><b><span style='font-size:10.0pt'>3. REQUIREMENTS</span></b> </p>
-
-<p><span style='font-size:10.0pt'>A Contributor may choose to distribute the
-Program in object code form under its own license agreement, provided that:</span>
-</p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it complies with the terms and conditions of this Agreement; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b)
-its license agreement:</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>i)
-effectively disclaims on behalf of all Contributors all warranties and
-conditions, express and implied, including warranties or conditions of title
-and non-infringement, and implied warranties or conditions of merchantability
-and fitness for a particular purpose; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>ii)
-effectively excludes on behalf of all Contributors all liability for damages,
-including direct, indirect, special, incidental and consequential damages, such
-as lost profits; </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iii)
-states that any provisions which differ from this Agreement are offered by that
-Contributor alone and not by any other party; and</span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>iv)
-states that source code for the Program is available from such Contributor, and
-informs licensees how to obtain it in a reasonable manner on or through a
-medium customarily used for software exchange.<span style='color:blue'> </span></span></p>
-
-<p><span style='font-size:10.0pt'>When the Program is made available in source
-code form:</span> </p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>a)
-it must be made available under this Agreement; and </span></p>
-
-<p class=MsoNormal style='margin-left:.5in'><span style='font-size:10.0pt'>b) a
-copy of this Agreement must be included with each copy of the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Contributors may not remove or alter any
-copyright notices contained within the Program. </span></p>
-
-<p><span style='font-size:10.0pt'>Each Contributor must identify itself as the
-originator of its Contribution, if any, in a manner that reasonably allows
-subsequent Recipients to identify the originator of the Contribution. </span></p>
-
-<p><b><span style='font-size:10.0pt'>4. COMMERCIAL DISTRIBUTION</span></b> </p>
-
-<p><span style='font-size:10.0pt'>Commercial distributors of software may
-accept certain responsibilities with respect to end users, business partners
-and the like. While this license is intended to facilitate the commercial use
-of the Program, the Contributor who includes the Program in a commercial
-product offering should do so in a manner which does not create potential
-liability for other Contributors. Therefore, if a Contributor includes the
-Program in a commercial product offering, such Contributor (&quot;Commercial
-Contributor&quot;) hereby agrees to defend and indemnify every other
-Contributor (&quot;Indemnified Contributor&quot;) against any losses, damages and
-costs (collectively &quot;Losses&quot;) arising from claims, lawsuits and other
-legal actions brought by a third party against the Indemnified Contributor to
-the extent caused by the acts or omissions of such Commercial Contributor in
-connection with its distribution of the Program in a commercial product
-offering. The obligations in this section do not apply to any claims or Losses
-relating to any actual or alleged intellectual property infringement. In order
-to qualify, an Indemnified Contributor must: a) promptly notify the Commercial
-Contributor in writing of such claim, and b) allow the Commercial Contributor
-to control, and cooperate with the Commercial Contributor in, the defense and
-any related settlement negotiations. The Indemnified Contributor may participate
-in any such claim at its own expense.</span> </p>
-
-<p><span style='font-size:10.0pt'>For example, a Contributor might include the
-Program in a commercial product offering, Product X. That Contributor is then a
-Commercial Contributor. If that Commercial Contributor then makes performance
-claims, or offers warranties related to Product X, those performance claims and
-warranties are such Commercial Contributor's responsibility alone. Under this
-section, the Commercial Contributor would have to defend claims against the
-other Contributors related to those performance claims and warranties, and if a
-court requires any other Contributor to pay any damages as a result, the
-Commercial Contributor must pay those damages.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>5. NO WARRANTY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, THE PROGRAM IS PROVIDED ON AN &quot;AS IS&quot; BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED INCLUDING,
-WITHOUT LIMITATION, ANY WARRANTIES OR CONDITIONS OF TITLE, NON-INFRINGEMENT,
-MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. Each Recipient is solely
-responsible for determining the appropriateness of using and distributing the
-Program and assumes all risks associated with its exercise of rights under this
-Agreement , including but not limited to the risks and costs of program errors,
-compliance with applicable laws, damage to or loss of data, programs or
-equipment, and unavailability or interruption of operations. </span></p>
-
-<p><b><span style='font-size:10.0pt'>6. DISCLAIMER OF LIABILITY</span></b> </p>
-
-<p><span style='font-size:10.0pt'>EXCEPT AS EXPRESSLY SET FORTH IN THIS
-AGREEMENT, NEITHER RECIPIENT NOR ANY CONTRIBUTORS SHALL HAVE ANY LIABILITY FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING WITHOUT LIMITATION LOST PROFITS), HOWEVER CAUSED AND ON ANY THEORY
-OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OR DISTRIBUTION OF
-THE PROGRAM OR THE EXERCISE OF ANY RIGHTS GRANTED HEREUNDER, EVEN IF ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.</span> </p>
-
-<p><b><span style='font-size:10.0pt'>7. GENERAL</span></b> </p>
-
-<p><span style='font-size:10.0pt'>If any provision of this Agreement is invalid
-or unenforceable under applicable law, it shall not affect the validity or
-enforceability of the remainder of the terms of this Agreement, and without
-further action by the parties hereto, such provision shall be reformed to the
-minimum extent necessary to make such provision valid and enforceable.</span> </p>
-
-<p><span style='font-size:10.0pt'>If Recipient institutes patent litigation
-against any entity (including a cross-claim or counterclaim in a lawsuit)
-alleging that the Program itself (excluding combinations of the Program with
-other software or hardware) infringes such Recipient's patent(s), then such
-Recipient's rights granted under Section 2(b) shall terminate as of the date
-such litigation is filed. </span></p>
-
-<p><span style='font-size:10.0pt'>All Recipient's rights under this Agreement
-shall terminate if it fails to comply with any of the material terms or
-conditions of this Agreement and does not cure such failure in a reasonable
-period of time after becoming aware of such noncompliance. If all Recipient's
-rights under this Agreement terminate, Recipient agrees to cease use and
-distribution of the Program as soon as reasonably practicable. However,
-Recipient's obligations under this Agreement and any licenses granted by
-Recipient relating to the Program shall continue and survive. </span></p>
-
-<p><span style='font-size:10.0pt'>Everyone is permitted to copy and distribute
-copies of this Agreement, but in order to avoid inconsistency the Agreement is
-copyrighted and may only be modified in the following manner. The Agreement
-Steward reserves the right to publish new versions (including revisions) of
-this Agreement from time to time. No one other than the Agreement Steward has
-the right to modify this Agreement. The Eclipse Foundation is the initial
-Agreement Steward. The Eclipse Foundation may assign the responsibility to
-serve as the Agreement Steward to a suitable separate entity. Each new version
-of the Agreement will be given a distinguishing version number. The Program
-(including Contributions) may always be distributed subject to the version of
-the Agreement under which it was received. In addition, after a new version of
-the Agreement is published, Contributor may elect to distribute the Program
-(including its Contributions) under the new version. Except as expressly stated
-in Sections 2(a) and 2(b) above, Recipient receives no rights or licenses to
-the intellectual property of any Contributor under this Agreement, whether
-expressly, by implication, estoppel or otherwise. All rights in the Program not
-expressly granted under this Agreement are reserved.</span> </p>
-
-<p><span style='font-size:10.0pt'>This Agreement is governed by the laws of the
-State of New York and the intellectual property laws of the United States of
-America. No party to this Agreement will bring a legal action under this
-Agreement more than one year after the cause of action arose. Each party waives
-its rights to a jury trial in any resulting litigation.</span> </p>
-
-<p class=MsoNormal></p>
-
-</div>
-
-</body>
-
-</html>
\ No newline at end of file
diff --git a/features/org.eclipse.tigerstripe.workbench/feature.properties b/features/org.eclipse.tigerstripe.workbench/feature.properties
deleted file mode 100644
index d206b85..0000000
--- a/features/org.eclipse.tigerstripe.workbench/feature.properties
+++ /dev/null
@@ -1,140 +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
-#
-# NLS_MESSAGEFORMAT_VAR
-
-# ==============================================================================
-# Do not change the properties between this line and the last line containing:
-# %%% END OF TRANSLATED PROPERTIES %%%
-# Instead, either redefine an existing property, or create a new property,
-# append it to the end of the file, and change the code to use the new name.
-# ==============================================================================
-
-# This file contains externalized strings for feature.xml
-# "%foo" in feature.xml corresponds to the key "foo" in this file
-# java.io.Properties file (ISO 8859-1 with "\" escapes)
-# This file should be translated.
-
-# "featureName" property - name of the feature
-featureName=End-User Tigerstripe Workbench (Incubation)
-
-# "providerName" property - name of the company that provides the feature
-providerName=Eclipse.org
-
-# "description" property - description of the feature
-description=Install this if you want to use the Tigerstripe End User Model Driven Engineering Workbench.
-
-# "licenseURL" property - URL of the "Feature License"
-# do not translate value - just change to point to a locale-specific HTML page
-licenseURL=license.html
-
-# "license" property - text of the "Feature Update License"
-# should be plain text version of license agreement pointed to be "licenseURL"
-license=\
-ECLIPSE FOUNDATION SOFTWARE USER AGREEMENT\n\
-March 17, 2005\n\
-\n\
-Usage Of Content\n\
-\n\
-THE ECLIPSE FOUNDATION MAKES AVAILABLE SOFTWARE, DOCUMENTATION, INFORMATION AND/OR\n\
-OTHER MATERIALS FOR OPEN SOURCE PROJECTS (COLLECTIVELY "CONTENT").\n\
-USE OF THE CONTENT IS GOVERNED BY THE TERMS AND CONDITIONS OF THIS\n\
-AGREEMENT AND/OR THE TERMS AND CONDITIONS OF LICENSE AGREEMENTS OR\n\
-NOTICES INDICATED OR REFERENCED BELOW. BY USING THE CONTENT, YOU\n\
-AGREE THAT YOUR USE OF THE CONTENT IS GOVERNED BY THIS AGREEMENT\n\
-AND/OR THE TERMS AND CONDITIONS OF ANY APPLICABLE LICENSE AGREEMENTS\n\
-OR NOTICES INDICATED OR REFERENCED BELOW. IF YOU DO NOT AGREE TO THE\n\
-TERMS AND CONDITIONS OF THIS AGREEMENT AND THE TERMS AND CONDITIONS\n\
-OF ANY APPLICABLE LICENSE AGREEMENTS OR NOTICES INDICATED OR REFERENCED\n\
-BELOW, THEN YOU MAY NOT USE THE CONTENT.\n\
-\n\
-Applicable Licenses\n\
-\n\
-Unless otherwise indicated, all Content made available by the Eclipse Foundation\n\
-is provided to you under the terms and conditions of the Eclipse Public\n\
-License Version 1.0 ("EPL"). A copy of the EPL is provided with this\n\
-Content and is also available at http://www.eclipse.org/legal/epl-v10.html.\n\
-For purposes of the EPL, "Program" will mean the Content.\n\
-\n\
-Content includes, but is not limited to, source code, object code,\n\
-documentation and other files maintained in the Eclipse.org CVS\n\
-repository ("Repository") in CVS modules ("Modules") and made available\n\
-as downloadable archives ("Downloads").\n\
-\n\
-   - Content may be structured and packaged into modules to facilitate delivering,\n\
-     extending, and upgrading the Content. Typical modules may include plug-ins ("Plug-ins"),\n\
-     plug-in fragments ("Fragments"), and features ("Features").\n\
-   - Each Plug-in or Fragment may be packaged as a sub-directory or JAR (Java ARchive)\n\
-     in a directory named "plugins".\n\
-   - A Feature is a bundle of one or more Plug-ins and/or Fragments and associated material.\n\
-     Each Feature may be packaged as a sub-directory in a directory named "features".\n\
-     Within a Feature, files named "feature.xml" may contain a list of the names and version\n\
-     numbers of the Plug-ins and/or Fragments associated with that Feature.\n\
-   - Features may also include other Features ("Included Features"). Within a Feature, files\n\
-     named "feature.xml" may contain a list of the names and version numbers of Included Features.\n\
-\n\
-Features may also include other Features ("Included Features"). Files named\n\
-"feature.xml" may contain a list of the names and version numbers of\n\
-Included Features.\n\
-\n\
-The terms and conditions governing Plug-ins and Fragments should be\n\
-contained in files named "about.html" ("Abouts"). The terms and\n\
-conditions governing Features and Included Features should be contained\n\
-in files named "license.html" ("Feature Licenses"). Abouts and Feature\n\
-Licenses may be located in any directory of a Download or Module\n\
-including, but not limited to the following locations:\n\
-\n\
-   - The top-level (root) directory\n\
-   - Plug-in and Fragment directories\n\
-   - Inside Plug-ins and Fragments packaged as JARs\n\
-   - Sub-directories of the directory named "src" of certain Plug-ins\n\
-   - Feature directories\n\
-\n\
-Note: if a Feature made available by the Eclipse Foundation is installed using the\n\
-Eclipse Update Manager, you must agree to a license ("Feature Update\n\
-License") during the installation process. If the Feature contains\n\
-Included Features, the Feature Update License should either provide you\n\
-with the terms and conditions governing the Included Features or inform\n\
-you where you can locate them. Feature Update Licenses may be found in\n\
-the "license" property of files named "feature.properties". Such Abouts,\n\
-Feature Licenses and Feature Update Licenses contain the terms and\n\
-conditions (or references to such terms and conditions) that govern your\n\
-use of the associated Content in that directory.\n\
-\n\
-THE ABOUTS, FEATURE LICENSES AND FEATURE UPDATE LICENSES MAY REFER\n\
-TO THE EPL OR OTHER LICENSE AGREEMENTS, NOTICES OR TERMS AND CONDITIONS.\n\
-SOME OF THESE OTHER LICENSE AGREEMENTS MAY INCLUDE (BUT ARE NOT LIMITED TO):\n\
-\n\
-    - Common Public License Version 1.0 (available at http://www.eclipse.org/legal/cpl-v10.html)\n\
-    - Apache Software License 1.1 (available at http://www.apache.org/licenses/LICENSE)\n\
-    - Apache Software License 2.0 (available at http://www.apache.org/licenses/LICENSE-2.0)\n\
-    - IBM Public License 1.0 (available at http://oss.software.ibm.com/developerworks/opensource/license10.html)\n\
-    - Metro Link Public License 1.00 (available at http://www.opengroup.org/openmotif/supporters/metrolink/license.html)\n\
-    - Mozilla Public License Version 1.1 (available at http://www.mozilla.org/MPL/MPL-1.1.html)\n\
-\n\
-IT IS YOUR OBLIGATION TO READ AND ACCEPT ALL SUCH TERMS AND CONDITIONS PRIOR\n\
-TO USE OF THE CONTENT. If no About, Feature License or Feature Update License\n\
-is provided, please contact the Eclipse Foundation to determine what terms and conditions\n\
-govern that particular Content.\n\
-\n\
-Cryptography\n\
-\n\
-Content may contain encryption software. The country in which you are\n\
-currently may have restrictions on the import, possession, and use,\n\
-and/or re-export to another country, of encryption software. BEFORE\n\
-using any encryption software, please check the country's laws,\n\
-regulations and policies concerning the import, possession, or use,\n\
-and re-export of encryption software, to see if this is permitted.\n\
-\n\
-Java and all Java-based trademarks are trademarks of Sun Microsystems, Inc. in the United States, other countries, or both.\n
-########### end of license property ##########################################
-
-# "TigerstripeUpdateSiteName" property - label for the update site (on download1.eclipse.org)
-TigerstripeUpdateSiteName=Tigerstripe Updates (Incubation)
diff --git a/features/org.eclipse.tigerstripe.workbench/feature.xml b/features/org.eclipse.tigerstripe.workbench/feature.xml
deleted file mode 100644
index 0586009..0000000
--- a/features/org.eclipse.tigerstripe.workbench/feature.xml
+++ /dev/null
@@ -1,206 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.workbench"
-      label="%featureName"
-      version="0.0.0"
-      provider-name="%providerName"
-      plugin="org.eclipse.tigerstripe.workbench.branding"
-      image="eclipse_update_120.jpg">
-
-   <description>
-      %description
-   </description>
-
-   <copyright url="http://www.eclipse.org/legal/epl-v10.html">
-      Copyright (c) 2008 Cisco Corporation and others.
-All rights reserved.   This program and the accompanying materials
-are made available under the terms of the Eclipse Public License
-v1.0
-which accompanies this distribution, and is available at
-http://www.eclipse.org/legal/epl-v10.html
-   </copyright>
-
-   <license url="%licenseURL">
-      %license
-   </license>
-
-   <url>
-      <update label="Tigerstripe Update Site (Incubation)" url="http://download.eclipse.org/technology/tigerstripe/updates"/>
-      <discovery label="%TigerstripeUpdateSiteName" url="http://download.eclipse.org/technology/tigerstripe/updates/"/>
-   </url>
-
-   <includes
-         id="org.eclipse.tigerstripe.base"
-         version="0.0.0"/>
-
-   <requires>
-      <import plugin="org.eclipse.ui"/>
-      <import plugin="org.eclipse.core.runtime"/>
-      <import plugin="org.eclipse.core.resources"/>
-      <import plugin="org.eclipse.jface"/>
-      <import plugin="org.eclipse.ui.ide"/>
-      <import plugin="org.eclipse.ui.views"/>
-      <import plugin="org.eclipse.ui.workbench"/>
-      <import plugin="org.eclipse.ui.workbench.texteditor"/>
-      <import plugin="org.eclipse.emf.ecore"/>
-      <import plugin="org.eclipse.emf.ecore.xmi"/>
-      <import plugin="org.eclipse.emf.edit.ui"/>
-      <import plugin="org.eclipse.gef"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.core"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.commands.core"/>
-      <import plugin="org.eclipse.gmf.runtime.emf.ui.properties"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.providers"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.providers.ide"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.render"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.resources.editor.ide"/>
-      <import plugin="org.eclipse.gmf.runtime.notation.providers"/>
-      <import plugin="org.eclipse.jdt.core"/>
-      <import plugin="org.eclipse.tigerstripe.workbench.base"/>
-      <import plugin="org.eclipse.ui.editors"/>
-      <import plugin="org.eclipse.jface.text"/>
-      <import plugin="org.eclipse.ui.forms"/>
-      <import plugin="org.eclipse.jdt.launching"/>
-      <import plugin="org.eclipse.jdt.ui"/>
-      <import plugin="org.eclipse.update.core"/>
-      <import plugin="org.eclipse.uml2"/>
-      <import plugin="org.eclipse.uml2.uml"/>
-      <import plugin="org.eclipse.uml2.uml.resources"/>
-      <import plugin="org.eclipse.draw2d"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui.render"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui.render.awt"/>
-      <import plugin="org.eclipse.gmf.runtime.notation.edit"/>
-      <import plugin="org.eclipse.team.ui"/>
-      <import plugin="org.eclipse.team.cvs.ui"/>
-      <import plugin="org.eclipse.ui.navigator"/>
-      <import plugin="org.eclipse.ui.navigator.resources"/>
-      <import plugin="org.eclipse.search"/>
-      <import plugin="org.eclipse.osgi.services"/>
-      <import plugin="org.eclipse.tigerstripe.annotation.ui"/>
-      <import plugin="org.eclipse.tigerstripe.annotation.core"/>
-      <import plugin="org.eclipse.ltk.ui.refactoring" version="3.4.1" match="greaterOrEqual"/>
-      <import plugin="org.eclipse.emf.ocl"/>
-      <import plugin="org.eclipse.emf.query.ocl"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.actions"/>
-      <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="org.eclipse.emf.common.ui"/>
-      <import plugin="org.eclipse.ltk.core.refactoring"/>
-      <import plugin="org.eclipse.jdt.core.manipulation"/>
-      <import plugin="org.eclipse.tigerstripe.annotation.tsmodel"/>
-   </requires>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.visualeditor.adaptation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.visualeditor"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.visualeditor.diagram"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.visualeditor.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.branding"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.optional.bulkImport"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.optional.UML2Export"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.instancediagram"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.instancediagram.adaptation"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.instancediagram.diagram"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.instancediagram.edit"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.diagramrendering"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.ui.UML2Import"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotation.tsmodel.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.workbench.optional.buckminster"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.workbench/pom.xml b/features/org.eclipse.tigerstripe.workbench/pom.xml
deleted file mode 100644
index f00386f..0000000
--- a/features/org.eclipse.tigerstripe.workbench/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-
-  <parent>
-    <groupId>org.eclipse.tigerstripe</groupId>
-    <artifactId>org.eclipse.tigerstripe.features.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tigerstripe.workbench</artifactId>
-  <packaging>eclipse-feature</packaging>
-  <name>features/o.e.t.workbench</name>
-
-</project>
diff --git a/features/pom.xml b/features/pom.xml
deleted file mode 100644
index b759bb1..0000000
--- a/features/pom.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<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>
-
-  <parent>
-    <groupId>org.eclipse.tigerstripe</groupId>
-    <artifactId>org.eclipse.tigerstripe.parent</artifactId>
-    <version>1.0.0-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>org.eclipse.tigerstripe.features.parent</artifactId>
-  <packaging>pom</packaging>
-  <name>plugins</name>
-
-</project>
diff --git a/generators/XMLExportV2-0/.classpath b/generators/XMLExportV2-0/.classpath
deleted file mode 100644
index da6a272..0000000
--- a/generators/XMLExportV2-0/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/XMLExportV2-0/.project b/generators/XMLExportV2-0/.project
deleted file mode 100644
index 5583b99..0000000
--- a/generators/XMLExportV2-0/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>XMLExportV2-0</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.pluggablePluginProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripePluginProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/util/AbstractRunnable.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/util/AbstractRunnable.class
deleted file mode 100644
index 1d31490..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/util/AbstractRunnable.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/SingleArtiXMLCreator.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/SingleArtiXMLCreator.class
deleted file mode 100644
index 19b156b..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/SingleArtiXMLCreator.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.class
deleted file mode 100644
index ea039a1..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/workbench/xml/ArtifactToXML.class b/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/workbench/xml/ArtifactToXML.class
deleted file mode 100644
index 0b9401c..0000000
--- a/generators/XMLExportV2-0/classes/org/eclipse/tigerstripe/workbench/xml/ArtifactToXML.class
+++ /dev/null
Binary files differ
diff --git a/generators/XMLExportV2-0/resources/artifact.xsl b/generators/XMLExportV2-0/resources/artifact.xsl
deleted file mode 100644
index 9202a5f..0000000
--- a/generators/XMLExportV2-0/resources/artifact.xsl
+++ /dev/null
@@ -1,1224 +0,0 @@
-<xsl:stylesheet version="1.0"
-	xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0">
-
-	<xsl:template match="/">
-		<html>
-			<body>
-				<p>
-					Project:
-					<xsl:value-of select="ts:tigerstripeProject/@name" />
-					Version:
-					<xsl:value-of select="ts:tigerstripeProject/@version" />
-				</p>
-				<xsl:if test="count(ts:tigerstripeProject/ts:annotations) &gt; 0">
-					<p>
-						<xsl:apply-templates select="ts:tigerstripeProject/ts:annotations"/><br/>
-					</p>
-				</xsl:if>
-				<xsl:if test="ts:tigerstripeProject/ts:comment">
-					<p>
-					
-					<xsl:apply-templates select="ts:tigerstripeProject/ts:comment" /><br/>
-				    </p>
-				</xsl:if>
-                <hr />				
-
-				<xsl:apply-templates select="ts:tigerstripeProject/ts:artifact"/>
-				
-
-			</body>
-		</html>
-	</xsl:template>
-	<xsl:template match="ts:artifact">
-	<font color="#FF6600">
-					<h2>
-						Artifact:
-						<xsl:value-of select="@name" />
-					</h2>
-				</font>
-				<p>
-					Artifact Type:
-					<xsl:value-of select="@artifactType" />
-				</p>
-				<xsl:if
-					test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IPackageArtifact'">
-					<p>
-						Extended Artifact:
-						<xsl:value-of
-							select="@extendedArtifact" />
-					</p>
-					<xsl:if
-						test="count(ts:implements/ts:implementedInterface) &gt; 0">
-						<p>Implemented Interfaces:</p>
-						<xsl:for-each
-							select="ts:implements/ts:implementedInterface">
-							<p>
-								<xsl:value-of select="." />
-							</p>
-						</xsl:for-each>
-					</xsl:if>
-					<p>
-						isAbstract:
-						<xsl:value-of select="@isAbstract" />
-					</p>
-				</xsl:if>
-				<xsl:if test="ts:comment">
-					<p>
-					
-					<xsl:apply-templates select="ts:comment" /><br/>
-				    </p>
-				</xsl:if>
-				
-
-				<xsl:if test="ts:stereotypes/ts:stereotype">
-                 <xsl:apply-templates select="ts:stereotypes"/><br/>
-                </xsl:if>
-                <xsl:if test="ts:annotations">
-                 <xsl:apply-templates select="ts:annotations"/><br/>
-                </xsl:if>
-
-
-
-
-
-				<!--enumerationSpecifics   -->
-
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-						<font color="#000099">
-							<h4>enumerationSpecifics</h4>
-						</font>
-						<p>
-							baseType:
-							<xsl:value-of select="ts:enumerationSpecifics/@baseType" />
-						</p>
-					</xsl:if>
-				
-
-
-				<!-- associationSpecifics and associationClassSpecifics-->
-
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' or
-                   @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-						<font color="#000099">
-							<h4>Association Specifics</h4>
-						</font>
-
-						<table border="1">
-							<tr>
-								<th>Name</th>
-								<th>End</th>
-								<th>Type</th>
-								<th>Multiplicity</th>
-								<th>Aggregation</th>
-								<th>Changeable</th>
-								<th>Navigable</th>
-								<th>Unique</th>
-								<th>Ordered</th>
-								<th>Visibility</th>
-							</tr>
-							<xsl:for-each select="ts:associationSpecifics/ts:associationEnd | ts:associationClassSpecifics/ts:associationEnd">
-								<tr>
-									<td>
-										<xsl:value-of select="@name" />
-									</td>
-									<td>
-										<xsl:value-of select="@end" />
-									</td>
-									<td>
-										<xsl:value-of select="@type" />
-									</td>
-									<td>
-										<xsl:value-of select="@multiplicity" />
-									</td>
-									<td>
-										<xsl:value-of select="@aggregation" />
-									</td>
-									<td>
-										<xsl:value-of select="@changeable" />
-									</td>
-									<td>
-										<xsl:value-of select="@navigable" />
-									</td>
-									<xsl:if
-										test="@multiplicity='0..*' or @multiplicity='1..*' or @multiplicity='*'">
-										<td>
-											<xsl:value-of select="@unique" />
-										</td>
-										<td>
-											<xsl:value-of select="@ordered" />
-										</td>
-									</xsl:if>
-									<xsl:if test="@multiplicity='0..1' or @multiplicity='0'">
-										<td>N/A</td>
-										<td>N/A</td>
-									</xsl:if>
-									<td>
-										<xsl:value-of select="@visibility" />
-									</td>
-								</tr>
-							</xsl:for-each>
-						</table>
-
-
-
-						<xsl:choose>
-							<xsl:when
-								test="count(ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0 or
-    count(ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-								<font color="#000099">
-									<h4>Association End Stereotypes</h4>
-								</font>
-								
-									
-
-										<table border="1">
-											<tr>
-												<th>Stereotype Name</th>
-												<th>End Name</th>
-												<th>Attribute Name</th>
-												<th>isArray</th>
-												<th>Value</th>
-											</tr>
-											<xsl:apply-templates select="ts:stereotype"/>
-											<xsl:for-each
-												select="ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype |
-												ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype">
-
-												<xsl:choose>
-													<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-														<xsl:variable name="row-span">
-															<xsl:value-of select="count(ts:stereotypeAttribute)" />
-														</xsl:variable>
-														<tr>
-															<td rowspan="{$row-span}">
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-														<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-															<tr>
-																<td>
-																	<xsl:value-of select="../../../@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@array" />
-																</td>
-																<td>
-																	<xsl:for-each select="ts:value">
-																		<p>
-																			<xsl:value-of select="." />
-																		</p>
-																	</xsl:for-each>
-																</td>
-															</tr>
-														</xsl:for-each>
-													</xsl:when>
-													<xsl:otherwise>
-														<tr>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:otherwise>
-												</xsl:choose>
-											</xsl:for-each>
-										</table>
-									</xsl:when>
-
-								
-								
-							
-							<xsl:otherwise>
-								<p>No Stereotypes</p>
-							</xsl:otherwise>
-						</xsl:choose>
-					</xsl:if>
-				
-
-
-
-				<!-- dependencySpecifics   -->
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact'">
-						<font color="#000099">
-							<h4>dependencySpecifics</h4>
-						</font>
-						<p>
-							aEndTypeName:
-							<xsl:value-of select="ts:dependencySpecifics/@aEndTypeName" />
-						</p>
-						<p>
-							zEndTypeName:
-							<xsl:value-of select="ts:dependencySpecifics/@zEndTypeName" />
-						</p>
-					</xsl:if>
-				
-
-				<!-- querySpecifics -->
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact'">
-						<font color="#000099">
-							<h4>querySpecifics</h4>
-						</font>
-						<p>
-							returnedTypeName:
-							<xsl:value-of select="ts:querySpecifics/@returnedTypeName" />
-						</p>
-						<p>
-							returnedTypeMultiplicity:
-							<xsl:value-of select="ts:querySpecifics/@returnedTypeMultiplicity" />
-						</p>
-					</xsl:if>
-				
-
-
-
-
-				<!-- Selecting only artifacts that support either Labels or Fields -->
-
-				
-					<xsl:if
-						test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IPackageArtifact'">
-
-
-						<!-- Constants  Literals -->
-
-						<xsl:if
-							test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact' and
-                      @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact'">
-
-							<font color="#FF6600">
-								<h3>Constants (Literals)</h3>
-							</font>
-							<xsl:if test="count(ts:literals/ts:literal) &gt; 0">
-								<table border="1">
-									<tr>
-										<th>Name</th>
-										<th>Type</th>
-										<th>Value</th>
-										<th>Visibility</th>
-										<th>Description</th>
-									</tr>
-									<xsl:for-each select="ts:literals/ts:literal">
-										<tr>
-											<td>
-												<xsl:value-of select="@name" />
-											</td>
-											<td>
-												<xsl:value-of select="@type" />
-											</td>
-											<td>
-												<xsl:value-of select="@value" />
-											</td>
-											<td>
-												<xsl:value-of select="@visibility" />
-											</td>
-											<td>
-												<xsl:value-of select="ts:comment" />
-											</td>
-										</tr>
-									</xsl:for-each>
-								</table>
-
-
-								<font color="#000099">
-									<h4>Constant Stereotypes</h4>
-								</font>
-								<xsl:choose>
-									<xsl:when
-										test="count(ts:literals/ts:literal/ts:stereotypes/ts:stereotype) &gt; 0">
-
-										<table border="1">
-											<tr>
-												<th>Stereotype Name</th>
-												<th>Constant name</th>
-												<th>Stereotype Attribute Name</th>
-												<th>isArray</th>
-												<th>Value</th>
-											</tr>
-											<xsl:for-each
-												select="ts:literals/ts:literal/ts:stereotypes/ts:stereotype">
-
-												<xsl:choose>
-													<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-														<xsl:variable name="row-span">
-															<xsl:value-of select="count(ts:stereotypeAttribute)" />
-														</xsl:variable>
-														<tr>
-															<td rowspan="{$row-span}">
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-														<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-															<tr>
-																<td>
-																	<xsl:value-of select="../../../@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@array" />
-																</td>
-																<td>
-																	<xsl:for-each select="ts:value">
-																		<p>
-																			<xsl:value-of select="." />
-																		</p>
-																	</xsl:for-each>
-																</td>
-															</tr>
-														</xsl:for-each>
-													</xsl:when>
-													<xsl:otherwise>
-														<tr>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:otherwise>
-												</xsl:choose>
-											</xsl:for-each>
-										</table>
-									</xsl:when>
-									<xsl:otherwise>
-										<p>No Stereotypes</p>
-									</xsl:otherwise>
-								</xsl:choose>
-
-							</xsl:if>
-
-							<xsl:if test="count(ts:literals/ts:literal) = 0">
-								<p>No constants</p>
-							</xsl:if>
-
-						</xsl:if>
-
-						<!-- Attributes  Fields -->
-
-						<xsl:if
-							test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-
-							<font color="#FF6600">
-								<h3>Attributes (Fields)</h3>
-							</font>
-							<xsl:if test="count(ts:fields/ts:field) &gt; 0">
-								<table border="1">
-									<tr>
-										<th>Name</th>
-										<th>Type</th>
-										<th>Multiplicity</th>
-										<th>Visibility</th>
-										<th>Readonly</th>
-										<th>Unique</th>
-										<th>Ordered</th>
-										<th>Default Value (optional)</th>
-										<th>Description</th>
-									</tr>
-									<xsl:for-each select="ts:fields/ts:field">
-										<tr>
-											<td>
-												<xsl:value-of select="@name" />
-											</td>
-											<td>
-												<xsl:value-of select="@type" />
-											</td>
-											<td>
-												<xsl:value-of select="@typeMultiplicity" />
-											</td>
-											<td>
-												<xsl:value-of select="@visibility" />
-											</td>
-											<td>
-												<xsl:value-of select="@readonly" />
-											</td>
-											<xsl:if
-												test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-												<td>
-													<xsl:value-of select="@unique" />
-												</td>
-												<td>
-													<xsl:value-of select="@ordered" />
-												</td>
-											</xsl:if>
-											<xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-												<td>N/A</td>
-												<td>N/A</td>
-											</xsl:if>
-											<td>
-												<xsl:value-of select="@defaultValue" />
-											</td>
-											<td>
-												<xsl:value-of select="ts:comment" />
-											</td>
-										</tr>
-									</xsl:for-each>
-								</table>
-
-								<font color="#000099">
-									<h4>Attribute Stereotypes</h4>
-								</font>
-								<xsl:choose>
-									<xsl:when
-										test="count(ts:fields/ts:field/ts:stereotypes/ts:stereotype) &gt; 0">
-										<table border="1">
-											<tr>
-												<th>Stereotype Name</th>
-												<th>Attribute Name</th>
-												<th>Stereotype Attribute Name</th>
-												<th>isArray</th>
-												<th>Value</th>
-											</tr>
-											<xsl:for-each
-												select="ts:fields/ts:field/ts:stereotypes/ts:stereotype">
-
-												<xsl:choose>
-													<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-														<xsl:variable name="row-span">
-															<xsl:value-of select="count(ts:stereotypeAttribute)" />
-														</xsl:variable>
-														<tr>
-															<td rowspan="{$row-span}">
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-														<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-															<tr>
-																<td>
-																	<xsl:value-of select="../../../@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@name" />
-																</td>
-																<td>
-																	<xsl:value-of select="@array" />
-																</td>
-																<td>
-																	<xsl:for-each select="ts:value">
-																		<p>
-																			<xsl:value-of select="." />
-																		</p>
-																	</xsl:for-each>
-																</td>
-															</tr>
-														</xsl:for-each>
-													</xsl:when>
-													<xsl:otherwise>
-														<tr>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@name" />
-															</td>
-															<td>
-																<xsl:value-of select="ts:stereotypeAttribute/@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:otherwise>
-												</xsl:choose>
-											</xsl:for-each>
-										</table>
-									</xsl:when>
-									<xsl:otherwise>
-										<p>No Stereotypes</p>
-									</xsl:otherwise>
-								</xsl:choose>
-
-
-							</xsl:if>
-							<xsl:if test="count(ts:fields/ts:field) = 0">
-								<p>No attributes</p>
-							</xsl:if>
-						</xsl:if>
-					</xsl:if>
-				
-
-
-
-				<!--       Methods        -->
-
-				
-					<xsl:if
-						test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact' or 
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-
-						<font color="#FF6600">
-							<h3>Methods</h3>
-						</font>
-						<xsl:if test="count(ts:methods/ts:method) &gt; 0">
-							<table border="1">
-								<tr>
-									<th>Name</th>
-									<th>isAbstract</th>
-									<th>Unique</th>
-									<th>Ordered</th>
-									<th>isVoid</th>
-									<th>Type</th>
-									<th>Multiplicity</th>
-									<th>Visibility</th>
-									<th>Return Name</th>
-									<th>Default Value</th>
-									<th>Description</th>
-									<th>
-										Arguments
-										<small>(click on argument name to jump to argument
-											details)</small>
-									</th>
-									<th>Exceptions</th>
-								</tr>
-								<xsl:for-each select="ts:methods/ts:method">
-									<tr>
-										<td>
-											<xsl:value-of select="@name" />
-										</td>
-										<td>
-											<xsl:value-of select="@isAbstract" />
-										</td>
-										<xsl:if
-											test="@returnTypeMultiplicity='0..*' or @returnTypeMultiplicity='1..*' or @returnTypeMultiplicity='*'">
-											<td>
-												<xsl:value-of select="@unique" />
-											</td>
-											<td>
-												<xsl:value-of select="@ordered" />
-											</td>
-										</xsl:if>
-										<xsl:if
-											test="@returnTypeMultiplicity='0..1' or @returnTypeMultiplicity='0'">
-											<td>N/A</td>
-											<td>N/A</td>
-										</xsl:if>
-
-
-										<td>
-											<xsl:value-of select="@isVoid" />
-										</td>
-										<td>
-											<xsl:value-of select="@returnType" />
-										</td>
-
-										<td>
-											<xsl:value-of select="@returnTypeMultiplicity" />
-										</td>
-
-										<td>
-											<xsl:value-of select="@visibility" />
-										</td>
-										<td>
-											<xsl:value-of select="@methodReturnName" />
-										</td>
-										<td>
-											<xsl:value-of select="@defaultReturnValue" />
-										</td>
-										<td>
-											<xsl:value-of select="ts:comment" />
-										</td>
-										<xsl:variable name="arg-name">
-											<xsl:value-of select="ts:arguments/ts:argument/@name" />
-										</xsl:variable>
-										<xsl:variable name="method-name">
-											<xsl:value-of select="@name" />
-										</xsl:variable>
-
-										<a href="#{$arg-name}{$method-name}">
-											<td>
-												<xsl:for-each select="ts:arguments/ts:argument">
-
-													<font color="#FF6600">
-														<p>
-															<xsl:value-of select="@name" />
-														</p>
-													</font>
-
-												</xsl:for-each>
-											</td>
-										</a>
-
-										<td>
-											<xsl:for-each select="ts:exceptions/ts:exception">
-												<p>
-													<xsl:value-of select="@name" />
-												</p>
-											</xsl:for-each>
-										</td>
-									</tr>
-								</xsl:for-each>
-							</table>
-
-							<font color="#000099">
-								<h4>Method Stereotypes</h4>
-							</font>
-							<xsl:choose>
-								<xsl:when
-									test="count(ts:methods/ts:method/ts:stereotypes/ts:stereotype) &gt; 0">
-									<table border="1">
-										<tr>
-											<th>Stereotype Name</th>
-											<th>Method</th>
-											<th>Stereotype Attribute Name</th>
-											<th>isArray</th>
-											<th>Value</th>
-										</tr>
-										<xsl:for-each
-											select="ts:methods/ts:method/ts:stereotypes/ts:stereotype">
-
-											<xsl:choose>
-												<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-													<xsl:variable name="row-span">
-														<xsl:value-of select="count(ts:stereotypeAttribute)" />
-													</xsl:variable>
-													<tr>
-														<td rowspan="{$row-span}">
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-													<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-														<tr>
-															<td>
-																<xsl:value-of select="../../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:for-each>
-												</xsl:when>
-												<xsl:otherwise>
-													<tr>
-														<td>
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</table>
-								</xsl:when>
-								<xsl:otherwise>
-									<p>No Stereotypes</p>
-								</xsl:otherwise>
-							</xsl:choose>
-
-							<font color="#000099">
-								<h4>Method Return Stereotypes</h4>
-							</font>
-							<xsl:choose>
-								<xsl:when
-									test="count(ts:methods/ts:method/ts:returnStereotypes/ts:stereotype) &gt; 0">
-									<table border="1">
-										<tr>
-											<th>Stereotype Name</th>
-											<th>Method</th>
-											<th>Method Return Name</th>
-											<th>Stereotype Attribute Name</th>
-											<th>isArray</th>
-											<th>Value</th>
-										</tr>
-										<xsl:for-each
-											select="ts:methods/ts:method/ts:returnStereotypes/ts:stereotype">
-
-											<xsl:choose>
-												<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-													<xsl:variable name="row-span">
-														<xsl:value-of select="count(ts:stereotypeAttribute)" />
-													</xsl:variable>
-													<tr>
-														<td rowspan="{$row-span}">
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@methodReturnName" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-													<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-														<tr>
-															<td>
-																<xsl:value-of select="../../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:for-each>
-												</xsl:when>
-												<xsl:otherwise>
-													<tr>
-														<td>
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</table>
-								</xsl:when>
-								<xsl:otherwise>
-									<p>No Stereotypes</p>
-								</xsl:otherwise>
-							</xsl:choose>
-
-
-							<!--       Arguments        -->
-
-
-							<font color="#000099">
-								<h4> Arguments</h4>
-							</font>
-							<table border="1">
-								<tr>
-									<th>Name</th>
-									<th>Method</th>
-									<th>Type</th>
-									<th>Multiplicity</th>
-									<th>Unique</th>
-									<th>Ordered</th>
-									<th>Default Value (optional)</th>
-									<th>Description</th>
-
-								</tr>
-								<xsl:for-each select="ts:methods/ts:method/ts:arguments/ts:argument">
-									<tr>
-										<xsl:variable name="arg-name">
-											<xsl:value-of select="@name" />
-										</xsl:variable>
-										<xsl:variable name="method-name">
-											<xsl:value-of select="../../@name" />
-										</xsl:variable>
-										<td>
-											<a name="{$arg-name}{$method-name}">
-												<xsl:value-of select="@name" />
-											</a>
-										</td>
-										<td>
-											<xsl:value-of select="../../@name" />
-										</td>
-										<td>
-											<xsl:value-of select="@type" />
-										</td>
-										<td>
-											<xsl:value-of select="@typeMultiplicity" />
-										</td>
-										<xsl:if
-											test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-											<td>
-												<xsl:value-of select="@unique" />
-											</td>
-											<td>
-												<xsl:value-of select="@ordered" />
-											</td>
-										</xsl:if>
-										<xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-											<td>N/A</td>
-											<td>N/A</td>
-										</xsl:if>
-										<td>
-											<xsl:value-of select="@defaultValue" />
-										</td>
-										<td>
-											<xsl:value-of select="ts:comment" />
-										</td>
-
-									</tr>
-								</xsl:for-each>
-							</table>
-
-							<font color="#000099">
-								<h4>Argument Stereotypes</h4>
-							</font>
-							<xsl:choose>
-								<xsl:when
-									test="count(ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype) &gt; 0">
-									<table border="1">
-										<tr>
-											<th>Stereotype Name</th>
-											<th>Argument</th>
-											<th>Stereotype Attribute Name</th>
-											<th>isArray</th>
-											<th>Value</th>
-										</tr>
-										<xsl:for-each
-											select="ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype">
-
-											<xsl:choose>
-												<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-													<xsl:variable name="row-span">
-														<xsl:value-of select="count(ts:stereotypeAttribute)" />
-													</xsl:variable>
-													<tr>
-														<td rowspan="{$row-span}">
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-													<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-														<tr>
-															<td>
-																<xsl:value-of select="../../../@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@name" />
-															</td>
-															<td>
-																<xsl:value-of select="@array" />
-															</td>
-															<td>
-																<xsl:for-each select="ts:value">
-																	<p>
-																		<xsl:value-of select="." />
-																	</p>
-																</xsl:for-each>
-															</td>
-														</tr>
-													</xsl:for-each>
-												</xsl:when>
-												<xsl:otherwise>
-													<tr>
-														<td>
-															<xsl:value-of select="@name" />
-														</td>
-														<td>
-															<xsl:value-of select="../../@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@name" />
-														</td>
-														<td>
-															<xsl:value-of select="ts:stereotypeAttribute/@array" />
-														</td>
-														<td>
-															<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-																<p>
-																	<xsl:value-of select="." />
-																</p>
-															</xsl:for-each>
-														</td>
-													</tr>
-												</xsl:otherwise>
-											</xsl:choose>
-										</xsl:for-each>
-									</table>
-								</xsl:when>
-								<xsl:otherwise>
-									<p>No Stereotypes</p>
-								</xsl:otherwise>
-							</xsl:choose>
-
-						</xsl:if>
-
-						<xsl:if test="count(ts:methods/ts:method) = 0">
-							<p>No methods</p>
-						</xsl:if>
-
-					</xsl:if>
-				
-				</xsl:template>
-				
-	<xsl:template match="ts:stereotypes">
-		<font color="#000099">
-			<h4>Stereotypes</h4>
-		</font>
-		<xsl:if test="count(ts:stereotype) &gt; 0">
-
-
-			<table border="1">
-				<tr>
-					<th>Stereotype Name</th>
-					<th>Attribute Name</th>
-					<th>isArray</th>
-					<th>Value</th>
-				</tr>
-				<xsl:apply-templates select="ts:stereotype"/>
-			</table>
-		</xsl:if>
-		<xsl:if test="count(ts:stereotype) = 0">
-			<p>No Stereotypes</p>
-		</xsl:if>
-	</xsl:template>
-
-	<xsl:template match="ts:annotations">
-		<font color="#000099">
-			<h4>Annotations</h4>
-		</font>
-		<p>
-			<xsl:value-of select="." />
-		</p>
-   </xsl:template>
-   
-   <xsl:template match="ts:comment">
-		<font color="#000099">
-			<h4>Description</h4>
-		</font>
-		<p>
-			<xsl:value-of select="." />
-		</p>
-   </xsl:template>
-   
-                       <xsl:template match="ts:stereotype">
-                       <xsl:choose>
-						<xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-							<xsl:variable name="row-span">
-								<xsl:value-of select="count(ts:stereotypeAttribute)" />
-							</xsl:variable>
-							<tr>
-								<td rowspan="{$row-span}">
-									<xsl:value-of select="@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute[1]/@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute[1]/@array" />
-								</td>
-								<td>
-									<xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-										<p>
-											<xsl:value-of select="." />
-										</p>
-									</xsl:for-each>
-								</td>
-							</tr>
-							<xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-								<tr>
-									<td>
-										<xsl:value-of select="@name" />
-									</td>
-									<td>
-										<xsl:value-of select="@array" />
-									</td>
-									<td>
-										<xsl:for-each select="ts:value">
-											<p>
-												<xsl:value-of select="." />
-											</p>
-										</xsl:for-each>
-									</td>
-								</tr>
-							</xsl:for-each>
-						</xsl:when>
-						<xsl:otherwise>
-							<tr>
-								<td>
-									<xsl:value-of select="@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute/@name" />
-								</td>
-								<td>
-									<xsl:value-of select="ts:stereotypeAttribute/@array" />
-								</td>
-								<td>
-									<xsl:for-each select="ts:stereotypeAttribute/ts:value">
-										<p>
-											<xsl:value-of select="." />
-										</p>
-									</xsl:for-each>
-								</td>
-							</tr>
-						</xsl:otherwise>
-					</xsl:choose>
-					</xsl:template>
-
-</xsl:stylesheet>
diff --git a/generators/XMLExportV2-0/resources/index.xsl b/generators/XMLExportV2-0/resources/index.xsl
deleted file mode 100644
index eda81af..0000000
--- a/generators/XMLExportV2-0/resources/index.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0">
-
-<xsl:template match="/">
- <html>
-    
-
-    <body>
-    <h2>Artifacts within Project: <xsl:value-of select="ts:tigerstripeProject/@name"/>
-        Version: <xsl:value-of select="ts:tigerstripeProject/@version"/></h2>
-    <hr/>
-    <p/>
-    
-
-    <table border="1">
-    <tr bgcolor="#9acd32">
-      <th align="left">Artifact Name</th>
-      <th align="left">Type</th>
-    </tr>
-    <xsl:for-each select="ts:tigerstripeProject/ts:artifactFile">
-    <xsl:sort select="@name"/>
-    <xsl:variable name="file-name"><xsl:value-of select="@fileName"/></xsl:variable>
-    <tr>    
-      <td><a href="{$file-name}" target="_blank"><xsl:value-of select="@name"/></a></td>   
-      <td><xsl:value-of select="@artifactType"/></td>
-    </tr>
-    </xsl:for-each>
-    </table>
-    <br/>
-    
-  </body>
-
-  </html>
-  
- 
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/generators/XMLExportV2-0/resources/tigerstripeExportSchema-v2-0.xsd b/generators/XMLExportV2-0/resources/tigerstripeExportSchema-v2-0.xsd
deleted file mode 100644
index 5536c19..0000000
--- a/generators/XMLExportV2-0/resources/tigerstripeExportSchema-v2-0.xsd
+++ /dev/null
@@ -1,290 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:tns="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0" 
-	xmlns:xs="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v2-0" 
-	elementFormDefault="qualified" 
-	version="1.1">
-	
-	<xs:element name="annotations" type="xs:string"/>
-	
-	<xs:complexType  name="annotatedType">
-		<xs:sequence>
-			<xs:element ref="tns:annotations" minOccurs="0" maxOccurs="1"/>
-		</xs:sequence>
-	</xs:complexType>
-	
-	<xs:element name="tigerstripeProject">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-					<xs:sequence>
-						<xs:element name="comment" type="xs:string" minOccurs="0"/>
-						<xs:choice>
-							<xs:element ref="tns:artifact" minOccurs="0" maxOccurs="unbounded"/>
-							<xs:element ref="tns:artifactFile" minOccurs="0" maxOccurs="unbounded"/>
-						</xs:choice>
-					</xs:sequence>
-					<xs:attribute name="name" type="xs:string" use="required"/>
-					<xs:attribute name="version" type="xs:string" use="required"/>
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifact">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-       			<xs:sequence>
-				<xs:element ref="tns:implements" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:literals" minOccurs="0"/>
-				<xs:element ref="tns:fields" minOccurs="0"/>
-				<xs:element ref="tns:methods" minOccurs="0"/>
-				<xs:choice>
-					<xs:element ref="tns:enumerationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationClassSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:dependencySpecifics" minOccurs="0"/>
-					<xs:element ref="tns:querySpecifics" minOccurs="0"/>
-				</xs:choice>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="extendedArtifact" type="xs:string" use="optional"/>
-			<xs:attribute name="artifactType" type="xs:string" use="required"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="optional"/>
-			</xs:extension>
-            </xs:complexContent>
-			<!-- The name and extendedArtifact are the FQNs of the artifacts not the simple name -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifactFile">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="artifactType" type="xs:string" use="optional"/>
-			<xs:attribute name="fileName" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="fields">
-		<xs:complexType>	             
-			<xs:sequence>
-				<xs:element ref="tns:field" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="field">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="readonly" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-		    </xs:extension>
-            </xs:complexContent>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literals">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:literal" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literal">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="value" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="methods">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:method" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="method">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:arguments" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element ref="tns:returnStereotypes" minOccurs="0"/>
-				<xs:element ref="tns:exceptions" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="returnType" type="xs:string" use="optional"/>
-			<xs:attribute name="returnTypeMultiplicity" type="xs:string" use="optional"/>
-			<xs:attribute name="isVoid" type="xs:boolean" use="required"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultReturnValue" type="xs:string" use="optional"/>
-			<xs:attribute name="methodReturnName" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="arguments">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:argument" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="argument">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-			<xs:attribute name="direction" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exceptions">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:exception" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exception">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<!-- The value in name is the FQN -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="returnStereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotype">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypeAttribute" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypeAttribute">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="array" type="xs:boolean" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="implements">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="implementedInterface" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Specific content for each Artifact Type -->
-	<xs:element name="enumerationSpecifics">
-		<xs:complexType>
-			<xs:attribute name="baseType" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Note, the two associationEnds are AEnd and ZEnd -->
-	<xs:element name="associationEnd">
-		<xs:complexType>
-			<xs:complexContent>
-                <xs:extension base="tns:annotatedType">
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="end" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="multiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="aggregation" type="xs:string" use="required"/>
-			<xs:attribute name="changeable" type="xs:string" use="required"/>
-			<xs:attribute name="navigable" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<!-- the value for "end" cannot be extracted from the model and so is set in the template -->
-			<!-- The value in type is the FQN of the type -->
-		        </xs:extension>
-            </xs:complexContent>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationClassSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="dependencySpecifics">
-		<xs:complexType>
-			<xs:attribute name="aEndTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="zEndTypeName" type="xs:string" use="required"/>
-			<!-- The value in EndTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="querySpecifics">
-		<xs:complexType>
-			<xs:attribute name="returnedTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="returnedTypeMultiplicity" type="xs:string" use="required"/>
-			<!-- The value in returnedTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/util/AbstractRunnable.java b/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/util/AbstractRunnable.java
deleted file mode 100644
index 25df88e..0000000
--- a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/util/AbstractRunnable.java
+++ /dev/null
@@ -1,188 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    R. Craddock (Cisco Systems, Inc.)
- *******************************************************************************/
-package org.eclipse.tigerstripe.generators.util;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.Map;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IExpander;
-import org.eclipse.tigerstripe.workbench.plugins.IRule;
-import org.eclipse.tigerstripe.workbench.plugins.IRuleReport;
-import org.eclipse.tigerstripe.workbench.plugins.IRunnableWrapper;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
-
-
-
-public abstract class AbstractRunnable implements IRunnableWrapper{
-
-	protected Map<String, Object> context ;
-
-	protected IRuleReport report = null;
-	protected IPluginConfig config = null;
-	protected ITigerstripeModelProject modelProject = null;
-	protected IExpander exp;
-		
-
-	public String makeFileName() throws TigerstripeException {
-		String base = "";
-		String target = "";
-		String file = "";
-		String dir = "";
-		
-		
-		base = modelProject.getLocation().toString();
-		target = modelProject.getProjectDetails().getOutputDirectory();
-		
-		String f = exp.expandVar(config.getProperty("fileName").toString());
-		f= checkValidDirectory(f,"fileName");
-		file = exp.expandVar(f);
-		String d = exp.expandVar(config.getProperty("xmlDir").toString());
-		d = checkValidDirectory(d,"xmlDir");
-		dir = exp.expandVar(d);
-		File dirs = new File(base+File.separator+
-				  target+File.separator+
-				  dir);
-		dirs.mkdirs();
-		
-		String fullFileName = base+File.separator+
-							  target+File.separator+
-							  dir+File.separator+
-							  file;
-		return fullFileName;
-	}
-	
-	private String checkValidDirectory(String d, String source){
-		char[] illegalCharacters = {'/', '?', '\\', ':', '*','>','<','"','|'};		
-	    for(int i = 0; i < d.length(); i++){
-	    	for(char illegal : illegalCharacters){
-	    		if(d.charAt(i) == illegal){
-	    			PluginLog.logWarning("WARNING: Configured "+source+" ("+d+") is illegal default will be used instead.");
-	    			return getDefault(source);
-	    		}
-	    	}
-	    }	    	
-		return d;
-	}
-	
-	protected String checkValidXSLFileName(String d, String source){
-		 Pattern p = Pattern.compile(".*\\.xsl[t]??");
-		 Matcher m = p.matcher(d);
-		 if(!m.matches()){
-			 PluginLog.logWarning("WARNING: Configured "+source+" ("+d+") not valid as not end with .xsl[t]. Default used.");
-			 return getDefault(source);
-		 }
-		return d = checkValidDirectory(d,source);
-	}
-	
-	private String getDefault(String source){
-		if(source.equalsIgnoreCase("xmlDir"))return "xmlExport";
-		else if(source.equalsIgnoreCase("indexXSL")) return "index.xsl";
-		else if(source.equalsIgnoreCase("artifactXSL")) return "artifact.xsl";
-		else if(source.equalsIgnoreCase("fileName")) return "${project.Name}.xml";
-		else return "no default";
-	}
-	
-	public String makeSingleArtiFileName(IAbstractArtifact artifact) throws TigerstripeException{
-		String base = "";
-		String target = "";
-		String file = "";
-		String extension = ".xml";
-		String path = "";
-		String dir = "";
-		
-		base = modelProject.getLocation().toString();
-		target = modelProject.getProjectDetails().getOutputDirectory();
-		String d = exp.expandVar(config.getProperty("xmlDir").toString());
-		d = checkValidDirectory(d,"xmlDir");
-		dir = exp.expandVar(d);
-		path = base+File.separator+target+File.separator+dir+File.separator+artifact.getPackage().replace(".", File.separator);
-		File dirs = new File(path);
-		dirs.mkdirs();
-		
-		String fullFileName = path+File.separator+artifact.getName()+extension;
-		PluginLog.logDebug("This is the file name: "+ fullFileName);
-		return fullFileName;
-	}
-	
-	
-	
-	public void setContext(Map<String, Object> arg0) {
-		this.context = arg0;
-		PluginLog.logInfo("Setting context");
-		
-		Object rpt = context.get(IRule.REPORT);
-		if (rpt instanceof IRuleReport){
-			this.report = (IRuleReport) rpt;
-			PluginLog.logTrace("Report : "+this.report);
-		}
-		
-		Object pluginConfig = context.get(IRule.PLUGINCONFIG);
-		if (pluginConfig instanceof IPluginConfig){
-			
-			config = (IPluginConfig) pluginConfig;
-			PluginLog.logTrace("Got plugin Config");
-			
-		}
-		Object proj = context.get(IRule.TSPROJECTHANDLE);
-		if (proj instanceof ITigerstripeModelProject){
-			modelProject = (ITigerstripeModelProject) proj;
-			PluginLog.logTrace("Got model project");
-		}
-		
-		exp = (IExpander) context.get(IRule.EXP);
-	}
-
-	public IRuleReport getReport() {
-		return report;
-	}
-	
-	public IPluginConfig getConfig() {
-		return config;
-	}
-	
-	/**
-	 * Save the package to a Resource.
-	 * 
-	 * @param package_
-	 * @param uri
-	 */
-	@SuppressWarnings("unchecked")	
-       public void save(String fileName,String contents ) {
-	    
-	    File file = new File(fileName);
-	    Object ovw = context.get(IRule.OVERWRITEFILES);
-	    boolean isOverwriteFiles = false;
-	    if (ovw instanceof Boolean){
-	    	isOverwriteFiles = (Boolean) ovw;
-	    	PluginLog.logDebug("IsOverwriteFiles "+Boolean.toString(isOverwriteFiles));
-	    }
-
-		try {
-			PrintWriter out = new PrintWriter(new FileWriter(file));
-			out.println(contents);
-			out.close();
-			PluginLog.logInfo("Export complete. "+file);
-			getReport().getGeneratedFiles().add(file.toString());
-		} catch (IOException ioe) {
-			PluginLog.logError("Export failed to save. " + file, ioe);
-		}
-	}
-	
-}
diff --git a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.java b/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.java
deleted file mode 100644
index 0d8e9f7..0000000
--- a/generators/XMLExportV2-0/src/org/eclipse/tigerstripe/generators/xml/v2/XMLCreator.java
+++ /dev/null
@@ -1,150 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2009 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    D. Keysell (Cisco Systems, Inc.)
- *******************************************************************************/
-package org.eclipse.tigerstripe.generators.xml.v2;
-
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.Collection;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.transform.OutputKeys;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-
-import org.eclipse.tigerstripe.generators.util.AbstractRunnable;
-import org.eclipse.tigerstripe.workbench.internal.core.model.importing.xml.ArtifactToXML;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IRule;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.ProcessingInstruction;
-
-
-public class XMLCreator extends AbstractRunnable{
-
-		
-	public void run() throws Exception {
-		Object artifactsObj = context.get(IRule.ARTIFACTS);
-		Collection<IAbstractArtifact> artifacts = (Collection<IAbstractArtifact>) artifactsObj;
-		String f = exp.expandVar(config.getProperty("singleFileOnly").toString());
-		DocumentBuilderFactory dbf = null;
-		
-		try {
-			// Make a XML document containing the various components of the pattern
-			dbf = DocumentBuilderFactory.newInstance();
-		} catch (Exception e){
-			e.printStackTrace();
-		}
-			DocumentBuilder db = dbf.newDocumentBuilder();
-			Document document = db.newDocument();
-			TransformerFactory tf = TransformerFactory.newInstance();
-			Transformer t = tf.newTransformer();
-			t.setOutputProperty(OutputKeys.INDENT, "yes");
-			
-			ArtifactToXML artifactToXML = new ArtifactToXML(document);
-			
-			Element rootElement = artifactToXML.getRootElement(modelProject);
-			PluginLog.logDebug(rootElement.toString());
-			document.appendChild(rootElement);
-			
-			
-			
-			
-			if(f.equalsIgnoreCase("false")){
-			String indexXSLStart = "href=\"./";
-			String ix = exp.expandVar(config.getProperty("indexXSL").toString());
-			ix = checkValidXSLFileName(ix, "indexXSL");
-		    String indexXSL = indexXSLStart.concat(ix).concat("\" type=\"text/xsl\"");
-			ProcessingInstruction xslt = document.createProcessingInstruction("xml-stylesheet", indexXSL);
-			document.insertBefore(xslt, rootElement);
-			for (IAbstractArtifact artifact : artifacts){
-				Element artifactElement = artifactToXML.artifactToIndexElement(artifact);
-				rootElement.appendChild(artifactElement);
-			}
-			} else {					
-			for (IAbstractArtifact artifact : artifacts){
-				Element artifactElement = artifactToXML.artifactToElement(artifact);
-				rootElement.appendChild(artifactElement);
-			}
-			}
-			
-			
-			DOMSource source = new DOMSource(document);
-			StringWriter sw = new StringWriter();
-			StreamResult sr = new StreamResult(sw);
-			t.transform(source, sr);
-			
-			// Now write it to the file
-			
-			
-			save(makeFileName(),sw.toString());
-		
-			
-			if(f.equalsIgnoreCase("false")){
-				for (IAbstractArtifact arti : artifacts){
-					Document artiDocument = db.newDocument();
-					ArtifactToXML aartifactToXML = new ArtifactToXML(artiDocument);
-					
-					String toRoot = pathToRoot(arti.getFullyQualifiedName());
-					String ax = exp.expandVar(config.getProperty("artifactXSL").toString());
-					String end = "\" type=\"text/xsl\"";
-					String transform = "href=\"".concat(toRoot).concat(ax).concat(end);
-					ProcessingInstruction xslt = artiDocument.createProcessingInstruction("xml-stylesheet", transform);
-					
-					Element arootElement = aartifactToXML.getRootElement(modelProject);					
-					artiDocument.appendChild(arootElement);
-					artiDocument.insertBefore(xslt, arootElement);
-					
-					
-					
-					Element artifactElement = aartifactToXML.artifactToElement(arti);					
-					arootElement.appendChild(artifactElement);
-					
-					
-					DOMSource asource = new DOMSource(artiDocument);
-					StringWriter asw = new StringWriter();
-					StreamResult asr = new StreamResult(asw);
-					t.transform(asource, asr);
-					
-					// Now write it to the file
-					
-					
-					save(makeSingleArtiFileName(arti),asw.toString());
-					}
-				}
-			
-		
-		}
-					
-		
-		
-	
-	public String pathToRoot(String inString){
-		String[] bits = inString.split("\\.");
-		//PluginLog.logDebug("String in: "+inString+", lenght of bits :"+bits.length);
-		String outString = "";
-		if(bits.length!=1){
-		for(int i=0; i<(bits.length-1); i++){
-			outString = outString + "../";
-		}
-		return outString;
-		}
-		else return "./";
-	}
-	
-}
diff --git a/generators/XMLExportV2-0/ts-plugin.xml b/generators/XMLExportV2-0/ts-plugin.xml
deleted file mode 100644
index d25710a..0000000
--- a/generators/XMLExportV2-0/ts-plugin.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts_plugin version="1.2">
-<project name="">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>1</version>
-<description>Generates either a single file containing an XML export of all the project (global setting singleFileOnly = true) or an index page and one XML export file per artifact (global setting singleFileOnly = false).&#13;
-Also the XML schema for the generated XML is copied to the output in the model project.&#13;
-In the singleFileOnly  = false mode a processing instruction pointing to XSL is added to each XML file. These XSL files are also copied to the output of the model project. The XSL convert the XML export to HTML pages for model documentation.</description>
-<provider>Cisco Systems</provider>
-<property name="defaultArtifactPackage">com.mycompany</property>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="4" isEnabled="true" logPath="XMLExportV2-0.log" maxRoll="9"/>
-<globalProperties>
-<property name="fileName" tipToolText="File Name of the single export file or index file in one file per artifact mode." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">${project.Name}.xml</property>
-<property name="xmlDir" tipToolText="Directory to which export xml files are generated" type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">xmlExport</property>
-<property name="singleFileOnly" tipToolText="Create single XML file only (true) or one per artifact in addition to the single file (false)." type="org.eclipse.tigerstripe.workbench.plugins.IBooleanPluginProperty">true</property>
-<property name="indexXSL" tipToolText="XSL file used to generate index page." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">index.xsl</property>
-<property name="artifactXSL" tipToolText="XSL used to generate artifact detail pages." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">artifact.xsl</property>
-</globalProperties>
-<globalRules>
-<rule description="Will either create a single file containing an XML export of all the project (global setting singleFileOnly = true) or an index page and one XML export file per artifact (global setting singleFileOnly = false)." enabled="true" name="allArtifactInOneFile" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalRunnableRule">
-<body overwriteFiles="true" runnableClassName="org.eclipse.tigerstripe.generators.xml.v2.XMLCreator" suppressFiles="false"/>
-</rule>
-<rule description="Copies the XML export schema and XSLT files to the model project output." enabled="true" name="copyResources" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\*" toDirectory="${ppProp.xmlDir}\"/>
-</rule>
-</globalRules>
-<artifactRules/>
-<classpathEntries/>
-<additionalFiles>
-<includeEntry relativePath="resources/"/>
-</additionalFiles>
-<advanced/>
-<annotationPlugins/>
-</ts_plugin>
diff --git a/generators/export-xml/.classpath b/generators/export-xml/.classpath
deleted file mode 100644
index 1273e5f..0000000
--- a/generators/export-xml/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/export-xml/.cvsignore b/generators/export-xml/.cvsignore
deleted file mode 100644
index 90b07e9..0000000
--- a/generators/export-xml/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-classes
diff --git a/generators/export-xml/.project b/generators/export-xml/.project
deleted file mode 100644
index b7e94e3..0000000
--- a/generators/export-xml/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>export-xml</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.pluggablePluginProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripePluginProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/export-xml/resources/artifact_converter.xsl b/generators/export-xml/resources/artifact_converter.xsl
deleted file mode 100644
index eeffe69..0000000
--- a/generators/export-xml/resources/artifact_converter.xsl
+++ /dev/null
@@ -1,871 +0,0 @@
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-xmlns:tsa="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0">
-
-<xsl:template match="/">
-  <html>
-  <body>
-    <p>Project: <xsl:value-of select="tsa:projectArtifact/@projectName"/>
- Version: <xsl:value-of select="tsa:projectArtifact/@projectVersion"/></p>
-
-<hr/>
-
-    <font color="#FF6600">
-     <h2>Artifact: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@name"/></h2>
-    </font>
-    <p>Artifact Type: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@artifactType"/></p>
-    <p>Extended Artifact: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@extendedArtifact"/></p>
-    <xsl:if test="count(tsa:projectArtifact/ts:artifact/ts:implements/ts:implementedInterface) &gt; 0">
-    <p>Implemented Interfaces:</p>
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact/ts:implements/ts:implementedInterface">
-    <p>    <xsl:value-of select="."/></p>
-    </xsl:for-each>
-    </xsl:if>
-    <p>isAbstract: <xsl:value-of select="tsa:projectArtifact/ts:artifact/@isAbstract"/></p>
-    <p>Description: <xsl:value-of select="tsa:projectArtifact/ts:artifact/ts:comment"/></p>
-    
-    
-    <font color="#000099">
-     <h4>Annotations</h4>
-    </font>
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-    <xsl:if test="count(ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-            
-            
-            </xsl:for-each>                              
-            </table>
-            </xsl:if>
-            <xsl:if test="count(ts:stereotypes/ts:stereotype) = 0">
-            <p>No annotations</p>
-            </xsl:if>
-            </xsl:for-each>
-
-      
-        <!--enumerationSpecifics   -->
-    
-     <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-      <font color="#000099">
-       <h4>enumerationSpecifics</h4>
-      </font>
-      <p>baseType: <xsl:value-of select="ts:enumerationSpecifics/@baseType"/></p>
-      </xsl:if>
-      </xsl:for-each>
-      
-      
-       <!-- associationSpecifics and associationClassSpecifics-->
-    
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' or
-                   @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-      <font color="#000099">
-       <h4>Association Specifics</h4>
-      </font>
-      
-      <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>End</th>
-            <th>Type</th>
-            <th>Multiplicity</th>
-            <th>Aggregation</th>
-            <th>Changeable</th>
-            <th>Navigable</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>Visibility</th>
-            </tr>
-         <xsl:for-each select="ts:associationSpecifics/ts:associationEnd">
-         <tr>
-          <td><xsl:value-of select="@name"/></td>
-          <td><xsl:value-of select="@end"/></td>
-          <td><xsl:value-of select="@type"/></td>
-          <td><xsl:value-of select="@multiplicity"/></td>
-          <td><xsl:value-of select="@aggregation"/></td>
-          <td><xsl:value-of select="@changeable"/></td>
-          <td><xsl:value-of select="@navigable"/></td>
-          <xsl:if test="@multiplicity='0..*' or @multiplicity='1..*' or @multiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-          </xsl:if>
-          <xsl:if test="@multiplicity='0..1' or @multiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-          </xsl:if>
-            <td><xsl:value-of select="@visibility"/></td>
-         </tr>
-         </xsl:for-each>
-         <xsl:for-each select="ts:associationClassSpecifics/ts:associationEnd">
-         <tr>
-          <td><xsl:value-of select="@name"/></td>
-          <td><xsl:value-of select="@end"/></td>
-          <td><xsl:value-of select="@type"/></td>
-          <td><xsl:value-of select="@multiplicity"/></td>
-          <td><xsl:value-of select="@aggregation"/></td>
-          <td><xsl:value-of select="@changeable"/></td>
-          <td><xsl:value-of select="@navigable"/></td>
-          <xsl:if test="@multiplicity='0..*' or @multiplicity='1..*' or @multiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-          </xsl:if>
-          <xsl:if test="@multiplicity='0..1' or @multiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-          </xsl:if>
-          <td><xsl:value-of select="@visibility"/></td>
-         </tr>
-         </xsl:for-each>
-       </table>
-      
-      
-          
-    <xsl:choose>
-    <xsl:when test="count(ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0 or
-    count(ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-    <font color="#000099">
-     <h4>Association End Annotations</h4>
-    </font>
-    <xsl:choose>
-    <xsl:when test="count(ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-    
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Constant</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:associationClassSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-        </xsl:when>
-      
-      </xsl:choose>
-      <xsl:choose>
-    <xsl:when test="count(ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype) &gt; 0">
-    
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Constant</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:associationSpecifics/ts:associationEnd/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-        </xsl:when>
-      
-      </xsl:choose>
-    </xsl:when>
-    <xsl:otherwise>
-      <p>No annotations</p>
-      </xsl:otherwise>
-    </xsl:choose>
-    </xsl:if>
-    </xsl:for-each>
-    
-    
-      
-      <!-- dependencySpecifics   -->
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact'">
-      <font color="#000099">
-       <h4>dependencySpecifics</h4>
-      </font>
-      <p>aEndTypeName: <xsl:value-of select="ts:dependencySpecifics/@aEndTypeName"/></p>
-      <p>zEndTypeName: <xsl:value-of select="ts:dependencySpecifics/@zEndTypeName"/></p>
-      </xsl:if>
-      </xsl:for-each>
-      
-      <!-- querySpecifics -->
-    <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-     <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact'">
-      <font color="#000099">
-       <h4>querySpecifics</h4>
-      </font>
-      <p>returnedTypeName: <xsl:value-of select="ts:querySpecifics/@returnedTypeName"/></p>
-      <p>returnedTypeMultiplicity: <xsl:value-of select="ts:querySpecifics/@returnedTypeMultiplicity"/></p>
-      </xsl:if>
-     </xsl:for-each>
-      
-          
-
-
-      <!-- Selecting only artifacts that support either Labels or Fields -->
-
-      <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-      <xsl:if test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact' and
-                    @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact'">
-
-
-              <!-- Constants  Literals -->
-     
-        <xsl:if test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact' and
-                      @artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact'">
-           
-        <font color="#FF6600">
-         <h3>Constants (Literals)</h3>
-        </font>
-        <xsl:if test="count(ts:literals/ts:literal) &gt; 0">
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Value</th>
-            <th>Visibility</th>
-            <th>Description</th>
-            </tr>
-            <xsl:for-each select="ts:literals/ts:literal">
-            <tr>
-            <td><xsl:value-of select="@name"/></td>
-            <td><xsl:value-of select="@type"/></td>
-            <td><xsl:value-of select="@value"/></td>
-             <td><xsl:value-of select="@visibility"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            </tr>
-            </xsl:for-each>
-            </table>
-            
-
-    <font color="#000099">
-     <h4>Constant Annotations</h4>
-    </font>
-    <xsl:choose>
-    <xsl:when test="count(ts:literals/ts:literal/ts:stereotypes/ts:stereotype) &gt; 0">
-    
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Constant</th>
-            <th>Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:literals/ts:literal/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-        </xsl:when>
-      <xsl:otherwise>
-      <p>No annotations</p>
-      </xsl:otherwise>
-      </xsl:choose>
-
-       </xsl:if>
-        
-       <xsl:if test="count(ts:literals/ts:literal) = 0">
-       <p>No constants</p>
-       </xsl:if>
-            
-       </xsl:if>
-
-              <!-- Attributes  Fields -->
-
-        <xsl:if test="@artifactType != 'org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact'">
-
-        <font color="#FF6600">
-         <h3>Attributes (Fields)</h3>
-        </font>
-        <xsl:if test="count(ts:fields/ts:field) &gt; 0">
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>Type</th>
-            <th>Multiplicity</th>
-            <th>Visibility</th>
-            <th>Readonly</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>Default Value (optional)</th>
-            <th>Description</th>
-            </tr>
-            <xsl:for-each select="ts:fields/ts:field">
-            <tr>
-            <td><xsl:value-of select="@name"/></td>
-            <td><xsl:value-of select="@type"/></td>
-            <td><xsl:value-of select="@typeMultiplicity"/></td>
-             <td><xsl:value-of select="@visibility"/></td>
-            <td><xsl:value-of select="@readonly"/></td>
-            <xsl:if test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-            </xsl:if>
-            <xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-            </xsl:if>
-            <td><xsl:value-of select="@defaultValue"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            </tr>
-            </xsl:for-each>
-            </table>
-
-<font color="#000099">
- <h4>Attribute Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:fields/ts:field/ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Attribute</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:fields/ts:field/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-     
-     </xsl:if>
-     </xsl:if>
-     <xsl:if test="count(ts:fields/ts:field) = 0">
-     <p>No attributes</p>
-     </xsl:if>
-     </xsl:if>
-     </xsl:for-each>
-     
-     
-
-              <!--       Methods        -->
-              
-        <xsl:for-each select="tsa:projectArtifact/ts:artifact">
-        <xsl:if test="@artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact' or 
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact' or
-                      @artifactType = 'org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact'">
-        
-        <font color="#FF6600">
-         <h3>Methods</h3>
-        </font>
-           <xsl:if test="count(ts:methods/ts:method) &gt; 0">
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>isAbstract</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>isVoid</th>
-            <th>Type</th>            
-            <th>Multiplicity</th>            
-            <th>Visibility</th>
-            <th>Return Name</th>
-            <th>Default Value</th>
-            <th>Description</th>
-            <th>Arguments <small>(click on argument name to jump to argument details)</small></th>
-            <th>Exceptions</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method">
-            <tr>
-            <td><xsl:value-of select="@name"/></td>
-            <td><xsl:value-of select="@isAbstract"/></td>
-            <xsl:if test="@returnTypeMultiplicity='0..*' or @returnTypeMultiplicity='1..*' or @returnTypeMultiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-            </xsl:if>
-            <xsl:if test="@returnTypeMultiplicity='0..1' or @returnTypeMultiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-            </xsl:if>
-            
-            
-            <td><xsl:value-of select="@isVoid"/></td>
-            <td><xsl:value-of select="@returnType"/></td>
-            
-            <td><xsl:value-of select="@returnTypeMultiplicity"/></td>
-            
-             <td><xsl:value-of select="@visibility"/></td>
-            <td><xsl:value-of select="@methodReturnName"/></td>
-            <td><xsl:value-of select="@defaultReturnValue"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            <xsl:variable name="arg-name"><xsl:value-of select="ts:arguments/ts:argument/@name"/></xsl:variable>            
-            <xsl:variable name="method-name"><xsl:value-of select="@name"/></xsl:variable>
-            
-              <a href="#{$arg-name}{$method-name}">            
-                <td>
-                  <xsl:for-each select="ts:arguments/ts:argument">
-                  
-                    <font color="#FF6600"><p><xsl:value-of select="@name"/></p></font>
-                    
-                   </xsl:for-each>
-                </td>
-              </a>
-            
-            <td><xsl:for-each select="ts:exceptions/ts:exception"><p><xsl:value-of select="@name"/></p></xsl:for-each></td>
-            </tr>
-            </xsl:for-each>
-            </table>
-
-<font color="#000099">
- <h4>Method Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:methods/ts:method/ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Method</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-  
-<font color="#000099">
- <h4>Method Return Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:methods/ts:method/ts:returnStereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Method</th>
-            <th>Method Return Name</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:returnStereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="../../@methodReturnName"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-
-
-              <!--       Arguments        -->
-
-
-        <font color="#000099">
-         <h4>   Arguments</h4>
-        </font>
-            <table border="1">
-            <tr>
-            <th>Name</th>
-            <th>Method</th>
-            <th>Type</th>
-            <th>Multiplicity</th>
-            <th>Unique</th>
-            <th>Ordered</th>
-            <th>Default Value (optional)</th>
-            <th>Description</th>
-            
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:arguments/ts:argument">
-            <tr>
-            <xsl:variable name="arg-name"><xsl:value-of select="@name"/></xsl:variable>
-            <xsl:variable name="method-name"><xsl:value-of select="../../@name"/></xsl:variable>
-            <td><a name="{$arg-name}{$method-name}"><xsl:value-of select="@name"/></a></td>
-            <td><xsl:value-of select="../../@name"/></td>
-            <td><xsl:value-of select="@type"/></td>
-            <td><xsl:value-of select="@typeMultiplicity"/></td>
-            <xsl:if test="@typeMultiplicity='0..*' or @typeMultiplicity='1..*' or @typeMultiplicity='*'">
-            <td><xsl:value-of select="@unique"/></td>
-            <td><xsl:value-of select="@ordered"/></td>
-            </xsl:if>
-            <xsl:if test="@typeMultiplicity='0..1' or @typeMultiplicity='0'">
-            <td>N/A</td>
-            <td>N/A</td>
-            </xsl:if>
-            <td><xsl:value-of select="@defaultValue"/></td>
-            <td><xsl:value-of select="ts:comment"/></td>
-            
-            </tr>
-            </xsl:for-each>
-            </table>
-
-<font color="#000099">
- <h4>Argument Annotations</h4>
-</font>
- <xsl:choose>
-  <xsl:when test="count(ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype) &gt; 0">
-    <table border="1">
-            <tr>
-            <th>Annotation Name</th>
-            <th>Argument</th>
-            <th>Annotation Attribute Name</th>
-            <th>isArray</th>
-            <th>Value</th>
-            </tr>
-            <xsl:for-each select="ts:methods/ts:method/ts:arguments/ts:argument/ts:stereotypes/ts:stereotype">
-            
-            <xsl:choose>
-             <xsl:when test="count(ts:stereotypeAttribute) &gt; 0">
-             <xsl:variable name="row-span"><xsl:value-of select="count(ts:stereotypeAttribute)"/></xsl:variable>
-              <tr>
-               <td rowspan="{$row-span}"><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute[1]/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute[1]/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              <xsl:for-each select="ts:stereotypeAttribute[position()>1]">
-              <tr>
-               <td><xsl:value-of select="../../../@name"/></td>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="@array"/></td>
-               <td>
-                <xsl:for-each select="ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-              </xsl:for-each>
-             </xsl:when>
-            <xsl:otherwise>
-             <tr>
-               <td><xsl:value-of select="@name"/></td>
-               <td><xsl:value-of select="../../@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@name"/></td>
-               <td><xsl:value-of select="ts:stereotypeAttribute/@array"/></td>
-               <td>
-                <xsl:for-each select="ts:stereotypeAttribute/ts:value">
-                 <p><xsl:value-of select="."/></p>
-                </xsl:for-each>
-               </td>
-              </tr>
-            </xsl:otherwise>
-           </xsl:choose>
-          </xsl:for-each>
-         </table>  
-   </xsl:when>
-   <xsl:otherwise>
-    <p>No annotations</p>
-   </xsl:otherwise>
-  </xsl:choose>
-            
-            </xsl:if>
-            
-            <xsl:if test="count(ts:methods/ts:method) = 0">
-            <p>No methods</p>
-            </xsl:if>
-            
-     </xsl:if>
-     </xsl:for-each>
-
-  </body>
-  </html>
-</xsl:template>
-</xsl:stylesheet>
diff --git a/generators/export-xml/resources/converter.xsl b/generators/export-xml/resources/converter.xsl
deleted file mode 100644
index d1aa77b..0000000
--- a/generators/export-xml/resources/converter.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<xsl:stylesheet version="1.0"
-xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0">
-
-<xsl:template match="/">
- <html>
-    
-
-    <body>
-    <h2>Artifacts within Project: <xsl:value-of select="ts:tigerstripeProject/@name"/>
-        Version: <xsl:value-of select="ts:tigerstripeProject/@version"/></h2>
-    <hr/>
-    <p/>
-    
-
-    <table border="1">
-    <tr bgcolor="#9acd32">
-      <th align="left">Artifact Name</th>
-      <th align="left">Type</th>
-    </tr>
-    <xsl:for-each select="ts:tigerstripeProject/ts:artifactFile">
-    <xsl:sort select="@name"/>
-    <xsl:variable name="file-name"><xsl:value-of select="@fileName"/></xsl:variable>
-    <tr>    
-      <td><a href="{$file-name}" target="_blank"><xsl:value-of select="@name"/></a></td>   
-      <td><xsl:value-of select="@artifactType"/></td>
-    </tr>
-    </xsl:for-each>
-    </table>
-    <br/>
-    
-  </body>
-
-  </html>
-  
- 
-</xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/generators/export-xml/resources/tigerstripeExportSchema.xsd b/generators/export-xml/resources/tigerstripeExportSchema.xsd
deleted file mode 100644
index 723a510..0000000
--- a/generators/export-xml/resources/tigerstripeExportSchema.xsd
+++ /dev/null
@@ -1,248 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- edited with XMLSpy v2005 rel. 3 U (http://www.altova.com) by Steve Jerman (Cisco Systems) -->
-<xs:schema xmlns:tns="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0" xmlns:xs="http://www.w3.org/2001/XMLSchema" targetNamespace="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0" elementFormDefault="qualified" version="1.1">
-	<xs:element name="tigerstripeProject">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:choice>
-					<xs:element ref="tns:artifact" minOccurs="0" maxOccurs="unbounded"/>
-					<xs:element ref="tns:artifactFile" minOccurs="0" maxOccurs="unbounded"/>
-				</xs:choice>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="version" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifact">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:implements" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:literals" minOccurs="0"/>
-				<xs:element ref="tns:fields" minOccurs="0"/>
-				<xs:element ref="tns:methods" minOccurs="0"/>
-				<xs:choice>
-					<xs:element ref="tns:enumerationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:associationClassSpecifics" minOccurs="0"/>
-					<xs:element ref="tns:dependencySpecifics" minOccurs="0"/>
-					<xs:element ref="tns:querySpecifics" minOccurs="0"/>
-				</xs:choice>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="extendedArtifact" type="xs:string" use="optional"/>
-			<xs:attribute name="artifactType" type="xs:string" use="optional"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="optional"/>
-			<!-- The name and extendedArtifact are the FQNs of the artifacts not the simple name -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="artifactFile">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="artifactType" type="xs:string" use="optional"/>
-			<xs:attribute name="fileName" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="fields">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:field" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="field">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="readonly" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literals">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:literal" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="literal">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="value" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="methods">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:method" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="method">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element ref="tns:arguments" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element ref="tns:returnStereotypes" minOccurs="0"/>
-				<xs:element ref="tns:exceptions" minOccurs="0" maxOccurs="unbounded"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="returnType" type="xs:string" use="optional"/>
-			<xs:attribute name="returnTypeMultiplicity" type="xs:string" use="optional"/>
-			<xs:attribute name="isVoid" type="xs:boolean" use="required"/>
-			<xs:attribute name="isAbstract" type="xs:boolean" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultReturnValue" type="xs:string" use="optional"/>
-			<xs:attribute name="methodReturnName" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="arguments">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:argument" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="argument">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="typeMultiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="optional"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="defaultValue" type="xs:string" use="optional"/>
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exceptions">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:exception" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="exception">
-		<xs:complexType>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<!-- The value in name is the FQN -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="returnStereotypes">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotype" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotype">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypeAttribute" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="stereotypeAttribute">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="value" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="array" type="xs:boolean" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="implements">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element name="implementedInterface" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Specific content for each Artifact Type -->
-	<xs:element name="enumerationSpecifics">
-		<xs:complexType>
-			<xs:attribute name="baseType" type="xs:string" use="required"/>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<!-- Note, the two associationEnds are AEnd and ZEnd -->
-	<xs:element name="associationEnd">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:stereotypes" minOccurs="0"/>
-				<xs:element name="comment" type="xs:string" minOccurs="0"/>
-			</xs:sequence>
-			<xs:attribute name="name" type="xs:string" use="required"/>
-			<xs:attribute name="end" type="xs:string" use="required"/>
-			<xs:attribute name="type" type="xs:string" use="required"/>
-			<xs:attribute name="multiplicity" type="xs:string" use="required"/>
-			<xs:attribute name="aggregation" type="xs:string" use="required"/>
-			<xs:attribute name="changeable" type="xs:string" use="required"/>
-			<xs:attribute name="navigable" type="xs:boolean" use="required"/>
-			<xs:attribute name="ordered" type="xs:boolean" use="required"/>
-			<xs:attribute name="visibility" type="xs:string" use="required"/>
-			<xs:attribute name="unique" type="xs:boolean" use="required"/>
-			<!-- the value for "end" cannot be extracted from the model and so is set in the template -->
-			<!-- The value in type is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="associationClassSpecifics">
-		<xs:complexType>
-			<xs:sequence>
-				<xs:element ref="tns:associationEnd" minOccurs="2" maxOccurs="2"/>
-			</xs:sequence>
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="dependencySpecifics">
-		<xs:complexType>
-			<xs:attribute name="aEndTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="zEndTypeName" type="xs:string" use="required"/>
-			<!-- The value in EndTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-	<xs:element name="querySpecifics">
-		<xs:complexType>
-			<xs:attribute name="returnedTypeName" type="xs:string" use="required"/>
-			<xs:attribute name="returnedTypeMultiplicity" type="xs:string" use="required"/>
-			<!-- The value in returnedTypeName is the FQN of the type -->
-		</xs:complexType>
-	</xs:element>
-</xs:schema>
diff --git a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/EntityUtil.java b/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/EntityUtil.java
deleted file mode 100644
index e9881b3..0000000
--- a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/EntityUtil.java
+++ /dev/null
@@ -1,90 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.plugins.xml;
-
-import java.lang.String;
-
-public class EntityUtil {
-
-	public String getFlag(String in){
-		if (in.contains(":")){
-			return in.substring(0,in.indexOf(":"));
-		}
-		if (in.contains(";")){
-			return in.substring(0,in.indexOf(";"));
-		}
-		else return in;
-	}
-	
-	/**
-	 * 	Returns the path which is the package name transformed into a path description.
-	 * 
-	 * @return String - the path to be used
-	 */
-	public String convertToPath(String inString){
-		return inString.replace(".", "/");
-	}
-	
-	public String pathToRoot(String inString){
-		String[] bits = inString.split("\\.");
-		String outString = "";
-		for(int i=0; i<bits.length; i++){
-			outString = outString + "../";
-		}
-		return outString;
-	}
-	
-/*	public String[] getExceptions(String in){
-		return in;
-	}
-	*/
-	public String encode(String str) {
-		  if (str == null)
-		   return "";
-
-		  StringBuffer sb = new StringBuffer();
-		  char[] data = str.toCharArray();
-		  char c, lastC = 0x0;
-		  for (char element : data) {
-		   c = element;
-		   if (c == '"') {
-		    sb.append("&quot;");
-		   } else if (c == '\'') {
-		    sb.append("&apos;");
-		   } else if (c == '<') {
-		    	sb.append("&lt;");
-		   } else if (c == '>') {
-			   sb.append("&gt;");
-		   }
-		   else if (c == '&') {
-		    sb.append("&amp;");
-		   } else if (c == '/' && lastC == '*') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&eCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else if (c == '*' && lastC == '/') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&bCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else {
-		    sb.append(c);
-		   }
-		   lastC = c;
-		  }
-		  return sb.toString();
-		 }
-}
diff --git a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/XmlModel.java b/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/XmlModel.java
deleted file mode 100644
index d1f83fa..0000000
--- a/generators/export-xml/src/org/eclipse/tigerstripe/plugins/xml/XmlModel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.plugins.xml;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactModel;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-public class XmlModel implements IArtifactModel{
-
-	private IAbstractArtifact artifact;
-	private IPluginConfig pluginRef;
-	
-	public void setIArtifact(IAbstractArtifact artifact ){
-		this.artifact = artifact;
-	}
-	
-	public void setPluginConfig(IPluginConfig newPluginRef) {
-		this.pluginRef = newPluginRef;
-}
-	
-	/**
-	 * 	Returns the path which is the package name transformed into a path description.
-	 * 
-	 * @return String - the path to be used
-	 */
-	public String getOutPath(){
-		return this.artifact.getPackage().replace(".", "/");
-	}
-	
-}
diff --git a/generators/export-xml/templates/artifact_details.vm b/generators/export-xml/templates/artifact_details.vm
deleted file mode 100644
index 45c84c6..0000000
--- a/generators/export-xml/templates/artifact_details.vm
+++ /dev/null
@@ -1,35 +0,0 @@
-    <ts:artifact name="$artifact.FullyQualifiedName"
-#if ($artifact.hasExtends())
-                 extendedArtifact="$artifact.Extends.FullyQualifiedName"
-#end
-                 artifactType="$artifact.ArtifactType"
-#if ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IPackageArtifact")
-                 isAbstract="$artifact.Abstract"
-#end
-                 >
-#if(!$artifact.getImplementedArtifacts().isEmpty())
-        <ts:implements>
-#foreach ($interface in $artifact.getImplementedArtifacts())
-            <ts:implementedInterface>$interface.FullyQualifiedName</ts:implementedInterface>
-#end
-        </ts:implements>
-#end
-#set($component = $artifact)
-#parse ("templates/xml/Comment.vm")
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Labels.vm")
-#parse ("templates/xml/Fields.vm")
-#parse ("templates/xml/Methods.vm")
-#set($component = $artifact)
-#if ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact")
-#parse ("templates/xml/enumerationSpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact")
-#parse ("templates/xml/associationSpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact")
-#parse ("templates/xml/associationClassSpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact")
-#parse ("templates/xml/dependencySpecifics.vm")
-#elseif ($artifact.ArtifactType == "org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact")
-#parse ("templates/xml/querySpecifics.vm")
-#end
-    </ts:artifact>
diff --git a/generators/export-xml/templates/tigerstripeArtifactExport.vm b/generators/export-xml/templates/tigerstripeArtifactExport.vm
deleted file mode 100644
index ee83f6a..0000000
--- a/generators/export-xml/templates/tigerstripeArtifactExport.vm
+++ /dev/null
@@ -1,17 +0,0 @@
-#set ($singleFile = $pluginConfig.getProperty("singleFile"))
-#if($singleFile == "false")
-<?xml version="1.0" encoding="UTF-8"?>
-<xs:schema xmlns:tns="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0" xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" targetNamespace="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0" version="1.0" xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0">
-    <xs:import namespace="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-            schemaLocation="tigerstripeExportSchema.xsd"/>
-        <xs:element name="projectArtifact">
-           <xs:complexType>
-               <xs:sequence>
-                   <xs:element maxOccurs="1" minOccurs="1" ref="ts:artifact"/>
-               </xs:sequence>
-               <xs:attribute name="projectName" type="xs:string" use="required"/>
-               <xs:attribute name="projectVersion" type="xs:string" use="required"/>
-        </xs:complexType>
-    </xs:element>
-</xs:schema>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml/Arguments.vm b/generators/export-xml/templates/xml/Arguments.vm
deleted file mode 100644
index 770fa12..0000000
--- a/generators/export-xml/templates/xml/Arguments.vm
+++ /dev/null
@@ -1,18 +0,0 @@
-#if(!$method.Arguments.isEmpty())
-                <ts:arguments>
-#foreach ($argument in $method.Arguments)
-                    <ts:argument name="$argument.Name" typeMultiplicity="$argument.Type.TypeMultiplicity.Label"
-                     type="$argument.Type.FullyQualifiedName"
-                     unique="$argument.Unique" ordered="$argument.Ordered" 
-#if ($argument.DefaultValue)
-                     defaultValue="$entityUtil.encode($argument.DefaultValue)"
-#end
-                     >
-#set($component = $argument)
-#parse ("templates/xml/Comment.vm")
-#set($component = $argument)
-#parse ("templates/xml/Stereotypes.vm")
-		                </ts:argument>
-#end
-                </ts:arguments>
-#end
diff --git a/generators/export-xml/templates/xml/Comment.vm b/generators/export-xml/templates/xml/Comment.vm
deleted file mode 100644
index 215361b..0000000
--- a/generators/export-xml/templates/xml/Comment.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-#if($component.Comment.length() != 0)
-                <ts:comment>$entityUtil.encode($component.comment)</ts:comment>
-#end
diff --git a/generators/export-xml/templates/xml/Exceptions.vm b/generators/export-xml/templates/xml/Exceptions.vm
deleted file mode 100644
index e4aee76..0000000
--- a/generators/export-xml/templates/xml/Exceptions.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-#if(!$method.Exceptions.isEmpty())
-                <ts:exceptions>
-#foreach ($exception in $method.Exceptions)
-                    <ts:exception name="$exception.FullyQualifiedName"/>
-#end
-                </ts:exceptions>
-#end
diff --git a/generators/export-xml/templates/xml/Fields.vm b/generators/export-xml/templates/xml/Fields.vm
deleted file mode 100644
index 47ed313..0000000
--- a/generators/export-xml/templates/xml/Fields.vm
+++ /dev/null
@@ -1,18 +0,0 @@
-#if(!$artifact.Fields.isEmpty())
-        <ts:fields>
-#foreach($field in $artifact.Fields)
-            <ts:field name="$field.Name" visibility="$field.Visibility.Label" 
-            type="$field.Type.FullyQualifiedName" typeMultiplicity="$field.Type.TypeMultiplicity.Label"
-             readonly="$field.ReadOnly"
-             unique="$field.Unique" ordered="$field.Ordered"
-#if ( $field.DefaultValue)
-             defaultValue="$entityUtil.encode($field.DefaultValue)"
-#end
-             >
-#set ($component = $field)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-            </ts:field>
-#end
-        </ts:fields>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml/Labels.vm b/generators/export-xml/templates/xml/Labels.vm
deleted file mode 100644
index 1c5c9de..0000000
--- a/generators/export-xml/templates/xml/Labels.vm
+++ /dev/null
@@ -1,11 +0,0 @@
-#if(!$artifact.Literals.isEmpty())
-        <ts:literals>
-#foreach ($label in $artifact.Literals)
-                <ts:literal name="$label.Name" value="$entityUtil.encode($label.Value)" type="$label.Type.FullyQualifiedName" visibility="$label.Visibility.Label">
-#set ($component = $label)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-                </ts:literal>
-#end
-        </ts:literals>
-#end
diff --git a/generators/export-xml/templates/xml/MethodFlavorExceptions.vm b/generators/export-xml/templates/xml/MethodFlavorExceptions.vm
deleted file mode 100644
index 490be3b..0000000
--- a/generators/export-xml/templates/xml/MethodFlavorExceptions.vm
+++ /dev/null
@@ -1,5 +0,0 @@
-                <ts:exceptions>
-#foreach ($exception in $EntityMethodFlavorDetails.Exceptions)
-	                    <ts:exception name="$exception"/>
-#end
-                <ts:/exceptions>
diff --git a/generators/export-xml/templates/xml/Methods.vm b/generators/export-xml/templates/xml/Methods.vm
deleted file mode 100644
index 657581b..0000000
--- a/generators/export-xml/templates/xml/Methods.vm
+++ /dev/null
@@ -1,28 +0,0 @@
-#if(!$artifact.Methods.isEmpty())
-        <ts:methods>
-#foreach($method in $artifact.Methods)
-            <ts:method name="$method.Name" visibility="$method.Visibility.Label" returnType="$method.ReturnType.FullyQualifiedName" 
-                       returnTypeMultiplicity="$method.ReturnType.TypeMultiplicity.Label" isVoid="$method.Void" 
-                       isAbstract="$method.Abstract"
-                       unique="$method.Unique" ordered="$method.Ordered"
-#if ($method.DefaultReturnValue)
-                       defaultReturnValue="$entityUtil.encode($method.DefaultReturnValue)"
-#end
-#if($method.ReturnName.length() != 0)
-                       methodReturnName="$entityUtil.encode($method.ReturnName)"
-#end
-                       >
-#set($component = $method)
-#parse ("templates/xml/Stereotypes.vm")
-#set($component = $method)
-#parse ("templates/xml/Arguments.vm")
-#set($component = $method)
-#parse ("templates/xml/ReturnStereotypes.vm")
-#set($component = $method)
-#parse ("templates/xml/Exceptions.vm")
-#set($component = $method)
-#parse ("templates/xml/Comment.vm")
-            </ts:method>
-#end
-        </ts:methods>
-#end
diff --git a/generators/export-xml/templates/xml/ReturnStereotypes.vm b/generators/export-xml/templates/xml/ReturnStereotypes.vm
deleted file mode 100644
index f360807..0000000
--- a/generators/export-xml/templates/xml/ReturnStereotypes.vm
+++ /dev/null
@@ -1,7 +0,0 @@
-#if(!$component.ReturnStereotypeInstances.isEmpty())
-                <ts:returnStereotypes>
-#foreach ($instance in $component.ReturnStereotypeInstances)
-#parse("templates/xml/StereoTypeCommon.vm")
-#end
-                </ts:returnStereotypes>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml/StereoTypeCommon.vm b/generators/export-xml/templates/xml/StereoTypeCommon.vm
deleted file mode 100644
index c23b816..0000000
--- a/generators/export-xml/templates/xml/StereoTypeCommon.vm
+++ /dev/null
@@ -1,13 +0,0 @@
-                   <ts:stereotype name="$instance.Name">
-#foreach ($attribute in $instance.CharacterizingStereotype.Attributes)
-                      <ts:stereotypeAttribute name="$attribute.Name" array="$attribute.Array">
-#if($attribute.Array == "false")
-                        <ts:value>$entityUtil.encode($instance.getAttributeValue($attribute))</ts:value>                       
-#else
-#foreach ($val in $instance.getAttributeValues($attribute))
-                        <ts:value>$entityUtil.encode($val)</ts:value>                   
-#end
-#end
-                      </ts:stereotypeAttribute>
-#end
-                   </ts:stereotype>
diff --git a/generators/export-xml/templates/xml/Stereotypes.vm b/generators/export-xml/templates/xml/Stereotypes.vm
deleted file mode 100644
index a5797e5..0000000
--- a/generators/export-xml/templates/xml/Stereotypes.vm
+++ /dev/null
@@ -1,8 +0,0 @@
-#if(!$component.StereotypeInstances.isEmpty())
-                <ts:stereotypes>
-#foreach ($instance in $component.StereotypeInstances)
-#parse("templates/xml/StereoTypeCommon.vm")
-#end
-
-                </ts:stereotypes>
-#end
diff --git a/generators/export-xml/templates/xml/associationClassSpecifics.vm b/generators/export-xml/templates/xml/associationClassSpecifics.vm
deleted file mode 100644
index 482b2fd..0000000
--- a/generators/export-xml/templates/xml/associationClassSpecifics.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-        <ts:associationClassSpecifics>
-#parse ("templates/xml/associationEnd.vm")
-        </ts:associationClassSpecifics>
diff --git a/generators/export-xml/templates/xml/associationEnd.vm b/generators/export-xml/templates/xml/associationEnd.vm
deleted file mode 100644
index 737c95d..0000000
--- a/generators/export-xml/templates/xml/associationEnd.vm
+++ /dev/null
@@ -1,16 +0,0 @@
-            <ts:associationEnd name="$artifact.AEnd.Name" end="AEnd" type="$artifact.AEnd.Type.FullyQualifiedName" multiplicity="$artifact.AEnd.Multiplicity.Label" 
-                                       aggregation="$artifact.AEnd.Aggregation.Label" changeable="$artifact.AEnd.Changeable.Label" navigable="$artifact.AEnd.Navigable" 
-                                       ordered="$artifact.AEnd.Ordered" visibility="$artifact.AEnd.Visibility"
-                                       unique="$artifact.AEnd.Unique">
-#set ($component = $artifact.AEnd)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-            </ts:associationEnd>
-            <ts:associationEnd name="$artifact.ZEnd.Name" end="ZEnd" type="$artifact.ZEnd.Type.FullyQualifiedName" multiplicity="$artifact.ZEnd.Multiplicity.Label" 
-                                       aggregation="$artifact.ZEnd.Aggregation.Label" changeable="$artifact.ZEnd.Changeable.Label" navigable="$artifact.ZEnd.Navigable" 
-                                       ordered="$artifact.ZEnd.Ordered" visibility="$artifact.ZEnd.Visibility"
-                                       unique="$artifact.ZEnd.Unique">
-#set ($component = $artifact.ZEnd)
-#parse ("templates/xml/Stereotypes.vm")
-#parse ("templates/xml/Comment.vm")
-            </ts:associationEnd>
diff --git a/generators/export-xml/templates/xml/associationSpecifics.vm b/generators/export-xml/templates/xml/associationSpecifics.vm
deleted file mode 100644
index dbb114e..0000000
--- a/generators/export-xml/templates/xml/associationSpecifics.vm
+++ /dev/null
@@ -1,3 +0,0 @@
-        <ts:associationSpecifics>
-#parse ("templates/xml/associationEnd.vm")
-        </ts:associationSpecifics>
diff --git a/generators/export-xml/templates/xml/dependencySpecifics.vm b/generators/export-xml/templates/xml/dependencySpecifics.vm
deleted file mode 100644
index d370879..0000000
--- a/generators/export-xml/templates/xml/dependencySpecifics.vm
+++ /dev/null
@@ -1,2 +0,0 @@
-        <ts:dependencySpecifics aEndTypeName="$artifact.AEndType.FullyQualifiedName" 
-                                zEndTypeName="$artifact.ZEndType.FullyQualifiedName"/>
diff --git a/generators/export-xml/templates/xml/enumerationSpecifics.vm b/generators/export-xml/templates/xml/enumerationSpecifics.vm
deleted file mode 100644
index d68b383..0000000
--- a/generators/export-xml/templates/xml/enumerationSpecifics.vm
+++ /dev/null
@@ -1 +0,0 @@
-        <ts:enumerationSpecifics baseType="$artifact.BaseTypeStr"/>
diff --git a/generators/export-xml/templates/xml/querySpecifics.vm b/generators/export-xml/templates/xml/querySpecifics.vm
deleted file mode 100644
index aa0da7a..0000000
--- a/generators/export-xml/templates/xml/querySpecifics.vm
+++ /dev/null
@@ -1 +0,0 @@
-        <ts:querySpecifics returnedTypeName="$artifact.ReturnedType.FullyQualifiedName" returnedTypeMultiplicity="$artifact.ReturnedType.TypeMultiplicity.Label"/>
diff --git a/generators/export-xml/templates/xml_export.vm b/generators/export-xml/templates/xml_export.vm
deleted file mode 100644
index 0ce4c9c..0000000
--- a/generators/export-xml/templates/xml_export.vm
+++ /dev/null
@@ -1,45 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#set ($singleFile = $pluginConfig.getProperty("singleFile"))
-#set ($indexXSL = $pluginConfig.getProperty("IndexXSL"))
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- *
- *	Generated with Tigerstripe Workbench $runtime.getProperty("tigerstripe.feature.version").
- *
- *
- *	Plugin  : $pluginConfig.groupId/$pluginConfig.pluginId ($pluginConfig.Version)
- *	
- *  DO NOT EDIT THIS CODE WAS AUTOMATICALLY GENERATED
--->
-<!--
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
--->
-
-#if($singleFile == "false")
-<?xml-stylesheet version="1.0" type="text/xsl" href="./xsl/$indexXSL"?>
-#end
-
-<ts:tigerstripeProject name="$tsProject.ProjectDetails.Name" version="$tsProject.ProjectDetails.Version"
-                       xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                       xsi:schemaLocation="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0 tigerstripeExportSchema.xsd">
-#foreach($artifact in $artifacts)
-#if($singleFile == "true")
-#parse ("templates/artifact_details.vm")
-#else
-        <ts:artifactFile name="$artifact.FullyQualifiedName" artifactType="$artifact.ArtifactType" fileName="$entityUtil.convertToPath($artifact.Package)/${artifact.Name}.xml"/>
-#end
-#end
-</ts:tigerstripeProject>
\ No newline at end of file
diff --git a/generators/export-xml/templates/xml_per_artifact.vm b/generators/export-xml/templates/xml_per_artifact.vm
deleted file mode 100644
index 77645f5..0000000
--- a/generators/export-xml/templates/xml_per_artifact.vm
+++ /dev/null
@@ -1,42 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#set ($singleFile = $pluginConfig.getProperty("singleFile"))
-#set ($artifactXSL = $pluginConfig.getProperty("ArtifactXSL"))
-#if($singleFile == "false")
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!--
- *
- *	 Generated with Tigerstripe Workbench $runtime.getProperty("tigerstripe.feature.version").
- *
- *
- *	Plugin  : $pluginConfig.groupId/$pluginConfig.pluginId ($pluginConfig.Version)
- *	
- *  DO NOT EDIT THIS CODE WAS AUTOMATICALLY GENERATED
--->
-<!--
-DOCUMENTATION IS PROVIDED "AS IS" AND ALL EXPRESS OR IMPLIED
-CONDITIONS, REPRESENTATIONS AND WARRANTIES, INCLUDING ANY IMPLIED
-WARRANTY OF MERCHANTABILITY, FITNESS FOR FOR A PARTICULAR PURPOSE OR
-NON-INFRINGEMENT, ARE DISCLAIMED, EXCEPT TO THE EXTENT THAT SUCH
-DISCLAIMERS ARE HELD TO BE LEGALLY INVALID.
--->
-
-
-<?xml-stylesheet version="1.0" type="text/xsl" href="$entityUtil.pathToRoot($artifact.Package)xsl/$artifactXSL"?>
-
-
-<tsa:projectArtifact projectName="$tsProject.ProjectDetails.Name" projectVersion="$tsProject.ProjectDetails.Version"
-                       xmlns:tsa="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0"
-                       xmlns:ts="http://org.eclipse.tigerstripe/xml/tigerstripeExport/v1-0"
-                       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                       xsi:schemaLocation="http://org.eclipse.tigerstripe/xml/tigerstripeArtifactExport/v1-0 tigerstripeArtifactExport.xsd">
-#parse ("templates/artifact_details.vm")
-</tsa:projectArtifact>
-#end
\ No newline at end of file
diff --git a/generators/export-xml/ts-plugin.xml b/generators/export-xml/ts-plugin.xml
deleted file mode 100644
index df461fb..0000000
--- a/generators/export-xml/ts-plugin.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts_plugin version="1.2">
-<project name="export-xml">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>3.3</version>
-<description>3.3 Support for Package Artifacts - small change to schema to make isAbstract Optional&#13;
-3.2 Fix for XML escape characters bug and schema sequence order issue.&#13;
-3.1 First Open Source version - removal of OSS/J specifics.&#13;
-This version of the Export Plugin can export a Tigerstripe Project in a single XML file or as one XML file per artifact (with an additional file giving summary details of the export).&#13;
-&#13;
-The XSD schema files that define the format of the exported XML are also generated to the ouput directory.&#13;
-&#13;
-Optionally XSL files can be included in the export such that HTML documentation of the Tigerstripe Project can be generated from the XML.&#13;
-&#13;
-Version 1.2.0 supprts meta model changes from Tigerstripe 2.2</description>
-<provider>Cisco Systems</provider>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="0" isEnabled="true" logPath="Full_Export.log" maxRoll="9"/>
-<globalProperties>
-<property name="xmldir" tipToolText="Directory to which export xml files are generated" type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">xml</property>
-<property name="singleFile" tipToolText="Create single XML file (true) or one per artifact (false)" type="org.eclipse.tigerstripe.workbench.plugins.IBooleanPluginProperty">true</property>
-<property name="IndexXSL" tipToolText="XSL file used to generate index page." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">converter.xsl</property>
-<property name="ArtifactXSL" tipToolText="XSL used to generate artifact detail pages." type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">artifact_converter.xsl</property>
-</globalProperties>
-<globalRules>
-<rule description="Extracts the selected Tigerstripe model to single XML file &lt;project_name&gt;.xml. The file is generated to the directory: tigerstripe.gen\&lt;xmldir&gt;." enabled="true" name="xml_export" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.plugins.xml.EntityUtil" entry="entityUtil"/>
-<body outputFile="${ppProp.xmldir}\${name}.xml" overwriteFiles="true" suppressFiles="true" template="templates\xml_export.vm"/>
-</rule>
-<rule description="Generates the schema file for the &quot;file per artifact&quot; export files and places it in the directory: tigerstripe.gen\&lt;xmldir&gt;." enabled="true" name="copyPerArtiSchema" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<body outputFile="${ppProp.xmldir}\tigerstripeArtifactExport.xsd" overwriteFiles="true" suppressFiles="true" template="templates\tigerstripeArtifactExport.vm"/>
-</rule>
-<rule description="Copy xml export schema from generator project to model project." enabled="true" name="schema" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\tigerstripeExportSchema.xsd" toDirectory="${ppProp.xmldir}\"/>
-</rule>
-<rule description="Copies the XSL files to tigerstripe.gen/&lt;xmldir&gt;/xslt directory." enabled="true" name="copyXSLs" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\*.xsl" toDirectory="${ppProp.xmldir}\xsl"/>
-</rule>
-</globalRules>
-<artifactRules>
-<rule description="Extracts the selected Tigerstripe model such that one XML export file is generated for each artifact. The XML export files have the following name &lt;artifact_name&gt;.xml. The files are generated to the directory: tigerstripe.gen\&lt;xmldir&gt;." enabled="true" name="xml_per_artifact" type="org.eclipse.tigerstripe.workbench.plugins.IArtifactBasedTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.plugins.xml.EntityUtil" entry="entityUtil"/>
-<body artifactFilterClass="" artifactType="Any Artifact" includeDependencies="false" modelClass="org.eclipse.tigerstripe.plugins.xml.XmlModel" modelClassName="model" outputFile="${ppProp.xmldir}/${model.OutPath}/${artifact.Name}.xml" overwriteFiles="true" suppressFiles="true" template="templates\xml_per_artifact.vm"/>
-</rule>
-</artifactRules>
-<classpathEntries/>
-<additionalFiles>
-<includeEntry relativePath="resources/"/>
-</additionalFiles>
-<advanced/>
-</ts_plugin>
diff --git a/generators/m0xml/.classpath b/generators/m0xml/.classpath
deleted file mode 100644
index 4ab2dac..0000000
--- a/generators/m0xml/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="lib" path="commons-lang-2.1.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/m0xml/.cvsignore b/generators/m0xml/.cvsignore
deleted file mode 100644
index 5a63071..0000000
--- a/generators/m0xml/.cvsignore
+++ /dev/null
@@ -1,2 +0,0 @@
-classes
-.annotations
diff --git a/generators/m0xml/.project b/generators/m0xml/.project
deleted file mode 100644
index 477d0db..0000000
--- a/generators/m0xml/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.generators.m0xml</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.ui.base.m0GeneratorProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/m0xml/about.html b/generators/m0xml/about.html
deleted file mode 100644
index b8d3c56..0000000
--- a/generators/m0xml/about.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>April 14, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this
-plug-in (&quot;Content&quot;). Unless otherwise indicated below, the
-Content is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is
-available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse
-Foundation, the Content is being redistributed by another party
-(&quot;Redistributor&quot;) and different terms and conditions may apply
-to your use of any object code in the Content. Check the Redistributor's
-license that was provided with the Content. If no such license exists,
-contact the Redistributor. Unless otherwise indicated below, the terms
-and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a
-	href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this Content directly
-from the Eclipse Foundation, the following is provided for informational
-purposes only, and you should look to the RedistributorÕs license for
-terms and conditions of use.</p>
-
-<h4>Apache Commons Components</h4>
-<p>The Commons is an Apache project focused on all aspects of
-reusable Java components (see <a href="http://commons.apache.org/">http://commons.apache.org/</a>).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<p>
-<p>This Tigerstripe Generator plugin includes binary versions of 1 sub-project of Apache
-Commons:
-<ul>
-	<li><strong>commons-lang-2.1.jar</strong>: Provides extra
-	functionality for classes in java.lang.</li>
-</ul>
-All Apache Commons components as subject to the terms and conditions of
-the
-<a href="http://commons.apache.org/license.html">Apache 2.0 License</a>
-.
-</p>
-</body>
-</html>
diff --git a/generators/m0xml/commons-lang-2.1.jar b/generators/m0xml/commons-lang-2.1.jar
deleted file mode 100644
index 87b80ab..0000000
--- a/generators/m0xml/commons-lang-2.1.jar
+++ /dev/null
Binary files differ
diff --git a/generators/m0xml/m0-generator.xml b/generators/m0xml/m0-generator.xml
deleted file mode 100644
index e73c509..0000000
--- a/generators/m0xml/m0-generator.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<m0-generator>
-<project name="MO Instance XML Plugin">
-<outputDirectory/>
-<version>0.3M1</version>
-<description>Convert M0 instance diagram to XML representation</description>
-<provider>Cisco</provider>
-</project>
-<pluginNature type="M0"/>
-<logger defautLevel="0" isEnabled="false" logPath="TestOut.log" maxRoll="9"/>
-<globalProperties/>
-<globalRules>
-<rule description="" enabled="true" name="XMLFile" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.plugins.m0xml.XmlUtils" entry="xmlUtils"/>
-<body outputFile="instances.xml" overwriteFiles="true" suppressFiles="true" template="templates\xml.vm"/>
-</rule>
-</globalRules>
-<classpathEntries>
-<entry relativePath="commons-lang-2.2.jar"/>
-</classpathEntries>
-<additionalFiles/>
-<advanced/>
-</m0-generator>
diff --git a/generators/m0xml/src/org/eclipse/tigerstripe/plugins/m0xml/XmlUtils.java b/generators/m0xml/src/org/eclipse/tigerstripe/plugins/m0xml/XmlUtils.java
deleted file mode 100644
index 85a0b2f..0000000
--- a/generators/m0xml/src/org/eclipse/tigerstripe/plugins/m0xml/XmlUtils.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*******************************************************************************
- * Copyright (c) 2007 Cisco Systems, Inc.
- * All rights reserved. This program and the accompanying materials
- * are made available under the terms of the Eclipse Public License v1.0
- * which accompanies this distribution, and is available at
- * http://www.eclipse.org/legal/epl-v10.html
- *
- * Contributors:
- *    S. Jerman (Cisco Systems, Inc.) - reformat for Code Open-Sourcing
- *******************************************************************************/
-package org.eclipse.tigerstripe.plugins.m0xml;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.regex.Pattern;
-
-import org.apache.commons.lang.StringEscapeUtils;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-
-public class XmlUtils {
-	
-	public static String getArtifactType(IAbstractArtifact artifact){
-		return "Unkown";
-	}
-
-	public static String getArtifactType(IDatatypeArtifact artifact){
-		return "ComplexType";
-	}
-	public static String getArtifactType(IEnumArtifact artifact){
-		return "Enumeration";
-	}
-
-	public static String getArtifactType(IAssociationClassArtifact artifact){
-		return "AssociationClass";
-	}
-
-	public static String getArtifactType(IManagedEntityArtifact artifact){
-		return "Class";
-	}
-	
-	private static Pattern quotePattern = Pattern.compile("^\".*\"$");
-	
-	/**
-	 * Split up string. delimiter is ',' - strings will be quoted.
-	 * Need to XML encode strings.
-	 * @param type
-	 * @param value
-	 * @return
-	 */
-	
-	
-	public static Collection<String> splitValues(String type, String value){
-		Collection<String> ret = new ArrayList<String>();
-		String[] sStr = value.split(",");
-		for (String s : sStr){
-			ret.add(StringEscapeUtils.escapeXml(s.trim()));
-//			ret.add(s);
-		}
-		return ret;
-	}
-
-}
\ No newline at end of file
diff --git a/generators/m0xml/templates/xml.vm b/generators/m0xml/templates/xml.vm
deleted file mode 100644
index fb2d69b..0000000
--- a/generators/m0xml/templates/xml.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<InstanceMap xmlns="http://tigerstripe.eclipse.org/instances" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://tigerstripe.eclipse.org/instances
-..\..\main\xsd\instances.xsd">
-
-#foreach( $cInstance in $classInstances )
-#set($type=$xmlUtils.getArtifactType($cInstance.Artifact))
-  <$type artifactName="$cInstance.InstanceName" class="$cInstance.Artifact.FullyQualifiedName" name="$cInstance.Artifact.name">
-#foreach( $variable in $cInstance.Variables )
-    <Variable name="$variable.Name" type="$variable.type" >
-#set($values = $xmlUtils.splitValues($variable.type,$variable.value))
-#foreach($value in $values) 
-        <Value>$value</Value>
-#end
-    </Variable>
-#end
-  </$type> 
-
-#end 
-#foreach( $association in $associationInstances )
-    <Association name="$association.Name" class="$association.Artifact.FullyQualifiedName">
-      <aEnd navigable="$association.aEndIsNavigable" name="$association.AEndName" artifactName="$association.AEnd.artifactName" />
-      <zEnd navigable="$association.zEndIsNavigable" name="$association.ZEndName" artifactName="$association.ZEnd.artifactName" />
-    </Association>
-
-#end
-</InstanceMap>
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/.classpath b/generators/tigerstripe-documentation/.classpath
deleted file mode 100644
index c55ffef..0000000
--- a/generators/tigerstripe-documentation/.classpath
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="var" path="Tigerstripe External API"/>
-	<classpathentry kind="var" path="Equinox Common"/>
-	<classpathentry kind="lib" path="commons-lang-2.1.zip"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/generators/tigerstripe-documentation/.project b/generators/tigerstripe-documentation/.project
deleted file mode 100644
index f68d048..0000000
--- a/generators/tigerstripe-documentation/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tigerstripe-documentation</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.tigerstripe.workbench.base.pluggablePluginProjectAuditor</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.tigerstripe.workbench.base.tigerstripePluginProject</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/generators/tigerstripe-documentation/.settings/org.eclipse.jdt.core.prefs b/generators/tigerstripe-documentation/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index d03fa9d..0000000
--- a/generators/tigerstripe-documentation/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,12 +0,0 @@
-#Wed May 28 09:59:04 BST 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.debug.lineNumber=generate
-org.eclipse.jdt.core.compiler.debug.localVariable=generate
-org.eclipse.jdt.core.compiler.debug.sourceFile=generate
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/generators/tigerstripe-documentation/about.html b/generators/tigerstripe-documentation/about.html
deleted file mode 100644
index f1f3ef6..0000000
--- a/generators/tigerstripe-documentation/about.html
+++ /dev/null
@@ -1,69 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
-    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<title>About</title>
-</head>
-<body lang="EN-US">
-<h2>About This Content</h2>
-
-<p>June 9, 2008</p>
-<h3>License</h3>
-
-<p>The Eclipse Foundation makes available all content in this
-plug-in (&quot;Content&quot;). Unless otherwise indicated below, the
-Content is provided to you under the terms and conditions of the Eclipse
-Public License Version 1.0 (&quot;EPL&quot;). A copy of the EPL is
-available at <a href="http://www.eclipse.org/legal/epl-v10.html">http://www.eclipse.org/legal/epl-v10.html</a>.
-For purposes of the EPL, &quot;Program&quot; will mean the Content.</p>
-
-<p>If you did not receive this Content directly from the Eclipse
-Foundation, the Content is being redistributed by another party
-(&quot;Redistributor&quot;) and different terms and conditions may apply
-to your use of any object code in the Content. Check the Redistributor's
-license that was provided with the Content. If no such license exists,
-contact the Redistributor. Unless otherwise indicated below, the terms
-and conditions of the EPL still apply to any source code in the Content
-and such source code may be obtained at <a
-	href="http://www.eclipse.org/">http://www.eclipse.org</a>.</p>
-
-<h3>Third Party Content</h3>
-<p>The Content includes items that have been sourced from third
-parties as set out below. If you did not receive this Content directly
-from the Eclipse Foundation, the following is provided for informational
-purposes only, and you should look to the RedistributorÕs license for
-terms and conditions of use.</p>
-
-<h4>Apache Commons Components</h4>
-<p>The Commons is an Apache project focused on all aspects of
-reusable Java components (see <a href="http://commons.apache.org/">http://commons.apache.org/</a>).
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-<p>
-<p>This Tigerstripe Generator plugin includes binary versions of 1 sub-project of Apache
-Commons:
-<ul>
-	<li><strong>commons-lang-2.1.jar</strong>: Provides extra
-	functionality for classes in java.lang.</li>
-</ul>
-All Apache Commons components as subject to the terms and conditions of
-the
-<a href="http://commons.apache.org/license.html">Apache 2.0 License</a>
-.
-</p>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/commons-lang-2.1.zip b/generators/tigerstripe-documentation/commons-lang-2.1.zip
deleted file mode 100644
index 87b80ab..0000000
--- a/generators/tigerstripe-documentation/commons-lang-2.1.zip
+++ /dev/null
Binary files differ
diff --git a/generators/tigerstripe-documentation/resources/styles.css b/generators/tigerstripe-documentation/resources/styles.css
deleted file mode 100644
index e8e68c9..0000000
--- a/generators/tigerstripe-documentation/resources/styles.css
+++ /dev/null
@@ -1,14 +0,0 @@
-h1           { font-family: Arial; color: White; background-color: Silver; }
-.small       {font-size: 8pt }
-.ct   { font-family: Arial; color: Blue; background-color: LightSteelblue; font-style: bold;}
-.enum   { font-family: Arial; color: Blue; background-color: LightSteelblue; font-style: bold;}
-h2           { font-family: Arial; font-style: italic; }
-h3           { font-family: Arial;color: Black; font-style: bold; }
-h4           { font-family: Arial;color: Black; font-style: bold; }
-body         { background-color: White; margin-top:0 }
-.local       { background-color: Lavender }
-.nlocal     { background-color: White }
-.propHigh {color: red;}
-.assoc       { font-family: Arial; color: Blue; background-color: LightGreen; font-style: bold; }
-.intf        { font-family: Arial; color: Blue; background-color: LightSalmon; font-style: bold;}
-.classNorm   { font-family: Arial; color: Blue; background-color: LightSteelblue; font-style: bold;}
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractClassModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractClassModel.java
deleted file mode 100644
index 9276680..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractClassModel.java
+++ /dev/null
@@ -1,513 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.generators.models;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IField;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ILiteral;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactModel;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-import org.eclipse.tigerstripe.workbench.project.IProjectDescriptor;
-import org.eclipse.tigerstripe.workbench.project.IProjectDetails;
-import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
-import org.eclipse.tigerstripe.workbench.queries.IQueryRelationshipsByArtifact;
-import org.apache.commons.lang.StringUtils;
-
-public class AbstractClassModel extends AbstractComponentModel implements IArtifactModel{
-	
-	private IAbstractArtifact artifact;
-	private Collection associationEnds;
-	private Collection dependencies;
-	
-
-	
-	
-	public AbstractClassModel(){
-		super();
-	}
-	
-	
-	public AbstractClassModel(IAbstractArtifact artifact){
-		build(artifact);
-	}
-	
-	public void setIArtifact(IAbstractArtifact artifact ){
-			build(artifact);
-	}
-
-	public void setPluginConfig(IPluginConfig newPluginRef) {
-			super.setPluginRef(newPluginRef);
-			
-	}
-
-	public void setPluginRef(IPluginConfig newPluginRef) {
-			super.setPluginRef(newPluginRef);
-			
-	}
-
-	protected void build(IAbstractArtifact artifact ){
-		super.build(artifact);
-		this.artifact = (IAbstractArtifact) artifact;
-		setRelationEnds();
-		
-	}
-	
-	/**
-	 * 	Returns the IArtifact used to build this Model
-	 * 
-	 * @return IArtifact - the artifact used to build this model
-	 */
-	public IAbstractArtifact getArtifact(){
-		return (IAbstractArtifact) this.artifact;
-	}
-	
-	public String getArtifactType(){
-		String in = this.artifact.getArtifactType();
-		return StringUtils.substringAfterLast(in, ".");	
-	}
-	
-	public String getPackage(){
-		return getArtifact().getPackage();
-	}
-	
-	
-	public String getArtifactName(){
-		return getArtifact().getName();
-	}
-	
-	/**
-	 * 	Returns the path which is the package name transformed into a path description.
-	 * 
-	 * @return String - the path to be used
-	 */
-	public String getOutPath(){
-		return getPackage().replace(".", "/");
-	}
-
-	
-	/** 
-	 * add getAssociationEnds
-	 * these are the ends of any association that "points" 
-	 * at this artifact 
-	 * 
-	 * 
-	 * 
-	 */
-	public void setRelationEnds(){
-		try {    		
-			ArrayList assEnds = new ArrayList();
-			ArrayList deps = new ArrayList();
-			ITigerstripeModelProject project = artifact.getTigerstripeProject();
-			// Legacy stuff ha sno project
-			if (project != null){
-				IArtifactManagerSession session = project.getArtifactManagerSession();    		
-				IQueryRelationshipsByArtifact outQuery = (IQueryRelationshipsByArtifact) session.makeQuery(IQueryRelationshipsByArtifact.class.getName());
-				outQuery.setIncludeDependencies(true);
-				outQuery.setOriginatingFrom(artifact.getFullyQualifiedName());
-				// OUTS
-				Collection outRefs = session.queryArtifact(outQuery);
-
-				// Each return is actually an Association Artifact, so get the "end" that points to us.
-				// We're looking at out goings, so the Aend should be us!
-				//System.out.println("Outgoing refs for "+artifact.getName() +" "+outRefs.size());
-				for (Object ref : outRefs){
-					if (ref instanceof IAssociationArtifact){
-							AssociationEndFacade aef = new AssociationEndFacade(((IAssociationArtifact)ref).getAEnd());
-							aef.setParentModel(ModelFactory.getInstance().getModel((IAssociationArtifact) ref));
-							assEnds.add(aef );
-						
-					} else if (ref instanceof IDependencyArtifact){						
-							deps.add((IDependencyArtifact)ref);
-					}
-				}
-
-				IQueryRelationshipsByArtifact inQuery = (IQueryRelationshipsByArtifact) session.makeQuery(IQueryRelationshipsByArtifact.class.getName());
-				inQuery.setTerminatingIn(artifact.getFullyQualifiedName());
-				inQuery.setIncludeDependencies(true);
-				Collection inRefs = session.queryArtifact(inQuery);
-
-				// Each return is actually an Association Artifact, so get the "end" that points to us.
-				for (Object ref : inRefs){
-					if (ref instanceof IAssociationArtifact){
-							AssociationEndFacade aef = new AssociationEndFacade(((IAssociationArtifact)ref).getZEnd());
-							aef.setParentModel(ModelFactory.getInstance().getModel((IAssociationArtifact) ref));
-							assEnds.add(aef );
-					} 
-				}
-			}
-    		associationEnds = assEnds;
-    		dependencies = deps;
-   			return ;
-    		
-		} catch (TigerstripeException t){
-			t.printStackTrace();
-			return;
-		}
-	}
-	
-	
-	
-	/**
-	 * Returns the fully qualified name for this interface model
-	 * 
-	 * @return String - the fully qualified name for this interface model
-	 */
-	public String getFullyQualifiedName(){
-		return this.artifact.getFullyQualifiedName();
-	}
-	
-	/**
-	 * Returns the generalization of this artifact.
-	 * @return
-	 */
-	public AbstractClassModel getGeneralization(){
-		
-		if (this.artifact.getExtendedArtifact() != null){
-			AbstractClassModel acm = ModelFactory.getInstance().getModel(this.artifact.getExtendedArtifact());
-			acm.setPluginRef(this.getPluginRef());
-			return acm;
-		} else {
-			return null; 
-		}		
-	}
-	
-	public Collection<AbstractClassModel> getAllGeneralizations(){
-		Collection<IAbstractArtifact> ancestors = getArtifact().getAncestors();
-		Collection<AbstractClassModel> gens = new ArrayList<AbstractClassModel>();
-		for (IAbstractArtifact ancestor : ancestors){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(ancestor);
-			model.setPluginRef(this.getPluginRef());
-			gens.add(model);
-		}
-		return gens;	
-	}
-	
-	/**
-	 *  
-	 *  Get a collection of every class that
-	 *  Extends this artifact (ie the opposite of Generalizations!) 
-	 *  
-	 */
-	public Collection getRealizations(){
-		Collection<IAbstractArtifact> realizations =  getArtifact().getExtendingArtifacts();
-		
-		Collection<IAbstractArtifact> implemented = getArtifact().getImplementingArtifacts();
-		Collection<AbstractClassModel> reals = new ArrayList<AbstractClassModel>();
-		
-		for (IAbstractArtifact realization : realizations){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(realization);
-			model.setPluginRef(this.getPluginRef());
-			reals.add(model);
-		}
-		
-		//AbstractClassModel[] reals = new AbstractClassModel[implemented.length];
-		
-		for (IAbstractArtifact implement : implemented){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(implement);
-			model.setPluginRef(this.getPluginRef());
-			//int n = realizations.length + i;
-			reals.add(model);
-		}
-		return reals;	
-	
-	}
-
-	/**
-	 *  
-	 *  Get a collection of every class that this artifact
-	 *  "exposes"
-	 */
-	public Collection getImplements(){	
-		Collection<IAbstractArtifact> implemented = getArtifact().getImplementedArtifacts();
-		Collection<AbstractClassModel> impls = new ArrayList<AbstractClassModel>();
-		
-		for (IAbstractArtifact implement : implemented){
-			AbstractClassModel model = ModelFactory.getInstance().getModel(implement);
-			model.setPluginRef(this.getPluginRef());
-			//int n = realizations.length + i;
-			impls.add(model);
-		}
-		return impls;	
-	
-	}
-
-	
-	/** 
-	 * rename & recast for getIextFields 
-	 * 
-	 */
-	public Collection getAttributes(){
-		Collection<FieldFacade> facades = new ArrayList<FieldFacade>();
-		for (IField field : getArtifact().getFields(true)){
-
-			FieldFacade facade = new FieldFacade( field);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	public Collection getAttributes(boolean boo){
-		Collection attributes = new ArrayList();
-		attributes.addAll(getAttributes());
-        if (boo)
-        	attributes.addAll(getInheritedAttributes());
-        return attributes;
-        
-	}
-
-	/** 
-	 * rename & recast for getInheritedIextFields 
-	 * 
-	 */
-	public Collection getInheritedAttributes(){
-		Collection<FieldFacade> facades = new ArrayList<FieldFacade>();
-		for (IField field : getArtifact().getInheritedFields(true)){
-
-			FieldFacade facade = new FieldFacade( field);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	public Collection getLiterals(boolean boo){
-		Collection attributes = new ArrayList();
-		attributes.addAll(getLiterals());
-        if (boo)
-        	attributes.addAll(getInheritedLiterals());
-        return attributes; 
-	}
-	
-	public Collection getLiterals(){
-		Collection<LabelFacade> facades = new ArrayList<LabelFacade>();
-		for (ILiteral literal : getArtifact().getLiterals(true)){
-
-			LabelFacade facade = new LabelFacade(literal);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	public Collection getInheritedLiterals(){
-		Collection<LabelFacade> facades = new ArrayList<LabelFacade>();
-		for (ILiteral literal : getArtifact().getInheritedLiterals(true)){
-
-			LabelFacade facade = new LabelFacade(literal);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-
-
-	/** 
-	 * rename & recast for getIextMethods 
-	 * 
-	 */
-	public Collection getOperations(){
-		Collection<MethodFacade> facades = new ArrayList<MethodFacade>();
-		for (IMethod method : getArtifact().getMethods(true)){
-
-			MethodFacade facade = new MethodFacade( method);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	/** 
-	 * rename & recast for getInheritedIextMethods 
-	 * 
-	 */
-	public Collection getInheritedOperations(){
-		Collection<MethodFacade> facades = new ArrayList<MethodFacade>();
-		for (IMethod method : getArtifact().getInheritedMethods(true)){
-
-			MethodFacade facade = new MethodFacade( method);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this);
-			facades.add(facade);
-		}
-		return facades;
-	}
-		
-	public Collection getOperations(boolean boo){
-		Collection operations = new ArrayList();
-		operations.addAll(getOperations());
-		if (boo)
-			operations.addAll(getInheritedOperations());
-		return operations;
-	}
-	
-	/** 
-	 * add getAssociationEnds
-	 * these are the ends of any association that "points" 
-	 * at this artifact 
-	 * 
-	 */
-	public Collection getAssociationEnds(){
-		return this.associationEnds;
-	
-	}
-	
-	public Collection getNavigableConnectingEnds(){
-		ArrayList navigableEnds = new ArrayList();
-		for (Object e : getAssociationEnds()){
-			AssociationEndFacade end = (AssociationEndFacade) e;
-			if (end.getOtherEnd().isNavigable()){
-				navigableEnds.add(end.getOtherEnd());
-			}
-		}
-		return navigableEnds;
-	}
-	
-	
-	public Collection getDependencies(){
-		return this.dependencies;
-	}
-   
-	
-	public boolean isAbstract(){
-		return this.getArtifact().isAbstract();
-	}
-		
-		
-
-	/**
-	 * @return the pluginRef
-	 */
-	public IPluginConfig getPluginRef() {
-		return pluginRef;
-	}
-	
-    
-    public boolean isDataType(){
-    	if (this instanceof DatatypeModel){
-    		return true;
-    	}
-    	if (this.artifact != null ){
-    		if (this.artifact.getPackage().equals("primitive") ){
-    			return true;
-    		} else {
-    			return false;
-    		}
-    	}
-    	return true;
-    	
-    }
-    
-    public boolean isException(){
-    	if (this instanceof ExceptionModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isManagedEntity(){
-    	if (this instanceof ManagedEntityModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isDependency(){
-    	if (this instanceof DependencyModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isEnumeration(){
-    	if (this instanceof EnumerationModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isQuery(){
-    	if (this instanceof QueryModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isUpdate(){
-    	if (this instanceof UpdateProcedureModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isNotification(){
-    	if (this instanceof NotificationModel){
-    		return true;
-    	}
-    	return false;
-    }
-    
-    public boolean isAssociation(){
-		if (this instanceof AssociationClassModel || this instanceof AssociationModel)
-			return true;
-		else
-			return false;
-	}
-	
-	public boolean isAssociationClass(){
-		if (this instanceof AssociationClassModel)
-			return true;
-		else
-			return false;
-	}
-    
-	public boolean isInterface(){
-		if (this instanceof SessionModel)
-			return true;
-		else
-			return false;
-	}
-	
-    
-    public boolean hasExtends(){
-    	return this.artifact.hasExtends();
-    }
-    
-    public ITigerstripeModelProject  getProject(){
-    	ITigerstripeModelProject pd =null;
-    	try{
-    	pd= this.artifact.getProject();
-    	}
-    	catch (TigerstripeException t){   
-    		PluginLog.logError("Failure to find project.");
-    	}
-    	return pd;
-    }
-    
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractComponentModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractComponentModel.java
deleted file mode 100644
index e8ee324..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AbstractComponentModel.java
+++ /dev/null
@@ -1,205 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent;
-import org.eclipse.tigerstripe.workbench.profile.stereotype.IStereotypeInstance;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-
-public abstract class AbstractComponentModel {
-	
-	protected static IPluginConfig pluginRef;
-	
-	private IModelComponent component;
-	
-	public AbstractComponentModel() {
-		super();
-	}
-
-	public void build(IModelComponent component){
-		this.component = component;
-	}
-	
-	public String getName(){
-		return component.getName();
-	}
-	
-	public String getComment(){
-		return component.getComment();
-	}
-	
-	public Collection<IStereotypeInstance> getStereotypeInstances() {
-		return component.getStereotypeInstances();
-	}
-	
-	public String findTaggedValue(String tagToGet){
-		Collection<IStereotypeInstance> stereos = getStereotypeInstances();
-		for (IStereotypeInstance stereo :stereos){
-			if (stereo.getName().equals(tagToGet)) {
-				try {
-					String[] values = stereo.getAttributeValues("value");
-					if (values.length >0){
-					String value = values[0];
-					return value;
-					} else 
-					{
-						return "";
-					}
-				}
-				 catch (TigerstripeException t){
-					 try {
-						 String value = stereo.getAttributeValue("value");
-						 return value;
-					 } catch (TigerstripeException t2){
-						 // Basically this thing isn't set
-						 return "";
-					 }
-				 }
-			}
-		}
-		return null;
-	}
-	
-	/** 
-	 * Use for an array Stereotype attribute
-	 * @param tagToGet
-	 * @return
-	 */
-	public Collection findTaggedValues( String tagToGet){
-		Collection<String> values = new ArrayList<String>();
-		Collection<IStereotypeInstance> stereos = getStereotypeInstances();
-		for (IStereotypeInstance stereo :stereos){	
-			if (stereo.getName().equals(tagToGet)) {
-				try {
-			
-					String[] valueEntries = stereo.getAttributeValues("value");
-					for (int v=0;v<valueEntries.length;v++){
-					    values.add(valueEntries[v].trim());	
-					}
-					
-				}
-				 catch (TigerstripeException t){
-					 return null;
-				 }
-			}
-		}
-		return values;
-	}
-	
-	public IModelComponent.EVisibility getVisibility() {
-		return component.getVisibility();
-	}
-	
-	public boolean isInActiveFacet() throws TigerstripeException {
-		return component.isInActiveFacet();
-	}
-
-	public String getVisibilityStr(){
-		
-		if (getVisibility() == IModelComponent.EVisibility.PUBLIC){
-			return "public";
-		}else if (getVisibility() == IModelComponent.EVisibility.PROTECTED){
-			return "protected";
-		}else if (getVisibility() == IModelComponent.EVisibility.PRIVATE){
-			return "private";
-		} else {
-			return "public";
-		}
-	}
-
-	public String getDocumentation(String leader){
-		int lineLength = 64; 
-		return getDocumentation(leader, lineLength, true);
-	}
-	
-	
-	public String getDocumentation(String leader, int lineLength, boolean htmlStyle){
-		// split into lines and pre-pend the "leader" on each one.
-
-		// if htmlStyle, then each paragraph should be containied in <p> </p> tags.
-		// A paragraph is delimited by an empty line?
-		
-		
-		// Make the line max of lineLength Chars
-		
-		if (getComment().length() == 0){
-			return leader;
-		}
-		String fullComment = "";
-		String[] paras =  getComment().split("\n\n");
-		for (String para : paras){
-			String newComment = "";
-			String[] lines = para.split("\n");
-			for (String line: lines){
-
-				while (line.length() > lineLength-leader.length()){
-					String firstLineFullWords;
-					String remains;
-					
-					String firstline = line.substring(0,lineLength-leader.length());
-					if (firstline.contains(" ")){
-						firstLineFullWords = firstline.substring(0,firstline.lastIndexOf(" "));
-						remains = line.substring(firstLineFullWords.length()+1);
-					} else {
-						firstLineFullWords = firstline;
-						remains = line.substring(firstLineFullWords.length());
-					}
-					newComment = newComment+leader+firstLineFullWords+"\n";
-					line = remains;
-
-				}
-				newComment = newComment+leader+line;
-			}
-			if (htmlStyle){
-				newComment = leader + "<p>" + "\n" + newComment +"\n" + leader + "</p>";
-			}
-			if (fullComment.equals("")){
-				fullComment = newComment;
-			} else {
-				fullComment = fullComment + "\n"+newComment;
-			}
-		}
-		return fullComment;
-	}
-	
-
-	public String getConfiguredProperty(String property){
-		if (! isConfiguredProperty(property))
-			return "";
-		return (String) this.getPluginRef().getProperty(property).toString();
-	}
-
-	public boolean isConfiguredProperty(String property){
-		if (null  == this.getPluginRef().getProperty(property)){
-			return false; }
-		else {
-
-			return true;}
-	}
-	
-
-	public void setPluginRef(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-	}
-
-	public IPluginConfig getPluginRef() {
-		return this.pluginRef;
-	}
-	
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ArgumentFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ArgumentFacade.java
deleted file mode 100644
index 7b23e8e..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ArgumentFacade.java
+++ /dev/null
@@ -1,286 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IArgument;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-import org.eclipse.tigerstripe.workbench.profile.stereotype.IStereotypeInstance;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-
-
-public class ArgumentFacade {
-
-	private IArgument argument;
-	private IPluginConfig pluginRef;
-	private AbstractClassModel parentModel;
-
-
-	public ArgumentFacade(){
-
-	}
-
-	public ArgumentFacade(IArgument argument) {
-		this.argument = argument;
-	}
-
-	public IType getType() {
-		return argument.getType();
-	}
-	
-
-	public String getName() {
-		return argument.getName();
-	}
-
-
-	public String getComment() {
-		return argument.getComment();
-	}
-
-
-	public IMethod getContainingMethod() {
-		return argument.getContainingMethod();
-	}
-	
-	public IArgument getArgument(){
-		return this.argument;
-	}
-
-
-	public IAbstractArtifact getContainingArtifact() {
-		return argument.getContainingArtifact();
-	}
-
-
-	public String getDefaultValue() {
-		return argument.getDefaultValue();
-	}
-
-
-	public boolean isOrdered() {
-		return argument.isOrdered();
-	}
-
-
-	public boolean isUnique() {
-		return argument.isUnique();
-	}
-
-	public boolean hasExactStereotype( String stereotypeName){
-		Collection<IStereotypeInstance> stereos = getStereotypeInstances();
-		for (IStereotypeInstance stereo : stereos ){
-			if (stereo.getName().equals(stereotypeName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-	
-	public Collection<IStereotypeInstance> getStereotypeInstances() {
-		return this.argument.getStereotypeInstances();
-	}
-
-	public void setPluginRef(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-	}
-	
-	/**
-	* "Getter" for lowerMultiplicity.
-	* No comment found in UML.
-	*/
-    public java.lang.String getLowerMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-
-    public java.lang.String getMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0..1";
-    	case ZERO_STAR:
-    		return "0..*";
-    	case STAR:
-    		return "*";
-    	default:
-    		return "1";
-    	}
-
-    }
-    
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getUpperMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return "unbounded";
-    	case STAR:
-    		return "unbounded";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "unbounded";
-    	default:
-    		return "unbounded";
-    	}
-	    }
-	
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-	
-    public AbstractClassModel getTypeModel(){
-    	if (getType().isArtifact()
-    			&& !getType().getFullyQualifiedName().startsWith("primitive")
-    			&& ! getType().isPrimitive()){
-    		AbstractClassModel model = ModelFactory.getInstance().getModel(getType().getArtifact());
-    		model.setPluginRef(this.getPluginRef());
-    		return model;
-    	}
-		return null;
-	}
-    
-	/**
-	 * Return true if this has "multiplicity" anything other than SINGLE
-	 */
-	public boolean isMany(){
-		
-		boolean many = this.getType().getTypeMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.STAR);
-		
-		return many;
-	}
-    
-    public boolean isTypePrimitive(){
-    	if(this.getType().isPrimitive() || this.getType().getFullyQualifiedName().startsWith("primitive") || this.getType().getFullyQualifiedName().equals("java.lang.String"))
-    		return true;
-    	else
-    		return false;
-    }
-    
-    public boolean isEnum(){
-    	if(this.getType().isEnum())
-    		return true;
-    		else
-    			return false;
-    }
-    
-
-	public IPluginConfig getPluginRef() {
-		return pluginRef;
-	}
-	
-    
-
-
-
-	public String getDocumentation(String leader, int lineLength, boolean htmlStyle){
-		// split into lines and pre-pend the "leader" on each one.
-
-		// Make the line max of lineLength Chars
-		String newComment = "";
-		if (getComment().length() == 0){
-			return "";
-		}
-		String[] lines = getComment().split("\n");
-		for (String line: lines){
-			line = leader+line;
-			while (line.length() > lineLength){
-				String firstline = line.substring(0,lineLength);
-				String firstLineFullWords = firstline.substring(0,firstline.lastIndexOf(" "));
-				
-				String remains = line.substring(firstLineFullWords.length()+1);
-				newComment = newComment+leader+firstLineFullWords+"\n";
-				line = leader+remains;
-			}
-			newComment = newComment+line;
-		}
-		return newComment;
-	}
-	
-	public String getConfiguredProperty(String property){
-		if (this.getPluginRef().getProperty(property) == null)
-			return "";
-		return (String) this.getPluginRef().getProperty(property).toString();
-	}
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationClassModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationClassModel.java
deleted file mode 100644
index 02d21e9..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationClassModel.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-
-
-public class AssociationClassModel extends AssociationModel {
-	
-	IAssociationClassArtifact associationClassArtifact;
-	
-	public AssociationClassModel() {
-		super();
-	}
-
-	public AssociationClassModel(IAbstractArtifact artifact) {
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-	    super.build(artifact);
-	    this.associationClassArtifact = (IAssociationClassArtifact) associationClassArtifact;
-	}
-    //	========= Additional features for UML Associations =====//
-	
-	public Collection getConnectionAssociationEnds(){
-		
-		return getAssociationEnds();
-	}
-
-	
-
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationEndFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationEndFacade.java
deleted file mode 100644
index a8f5548..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationEndFacade.java
+++ /dev/null
@@ -1,309 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationEnd;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IRelationship;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationEnd.EAggregationEnum;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationEnd.EChangeableEnum;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-import org.eclipse.tigerstripe.generators.models.AssociationClassModel;
-import org.eclipse.tigerstripe.generators.models.AssociationModel;
-
-
-public class AssociationEndFacade extends AbstractComponentModel {
-
-    private IAssociationEnd end;
-    private AbstractClassModel parentModel;
-
-	
-	public AssociationEndFacade(){
-		super();
-	}
-	
-	public AssociationEndFacade(IAssociationEnd end) {
-		build(end);
-	}
-	
-	public void build(IAssociationEnd end) {
-		super.build(end);
-		this.end = end;
-	}
-	
-	public IType getType(){
-		return end.getType();
-	}
-	
-	/**
-	 * Get the thing that contains this attribute
-	 * @return
-	 */
-	public AssociationModel getAssociation(){
-		AssociationModel model ;
-		if (this.getContainingAssociation() instanceof IAssociationClassArtifact){
-			 model = new AssociationClassModel(this.getContainingArtifact());
-			 model.setPluginRef(this.getPluginRef());
-		} else {
-			 model = new AssociationModel(this.getContainingAssociation());
-			 model.setPluginRef(this.getPluginRef());
-		}
-		model.setPluginRef(getPluginRef());
-		return model;
-	}
-	
-	public EAggregationEnum getEAggregation() {
-		return end.getAggregation();
-	}
-
-	public EChangeableEnum getChangeable() {
-		return end.getChangeable();
-	}
-
-	public EMultiplicity getMultiplicity() {
-		return end.getMultiplicity();
-	}
-	
-	public java.lang.String getDocMultiplicity(){
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0..1";
-    	case ZERO_STAR:
-    		return "0..*";
-    	case STAR:
-    		return "*";
-    	default:
-    		return "1";
-    	}
-
-    }
-	
-    public java.lang.String getLowerMultiplicity(){
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-    
-	public java.lang.String getUpperMultiplicity(){
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return "unbounded";
-    	case STAR:
-    		return "unbounded";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "unbounded";
-    	default:
-    		return "unbounded";
-    	}
-	    }
-
-	
-	public java.lang.String getUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-
-
-
-	public boolean isNavigable() {
-		return end.isNavigable();
-	}
-
-	public boolean isOrdered() {
-		return end.isOrdered();
-	}
-	
-	public boolean isOptional() {
-		return this.getLowerMultiplicity().equals("0");
-	}
-	
-	public boolean isRequired() {
-		
-		return !isOptional();
-	}
-	
-	public boolean isField(){
-		return false;
-	}
-
-	public IAbstractArtifact getContainingAssociation() {
-		return this.end.getContainingAssociation();
-	}
-	
-	public IAbstractArtifact getContainingArtifact() {
-		return this.end.getContainingAssociation();
-	}
-	
-	public IRelationship getContainingRelationship() {
-		return this.end.getContainingRelationship();
-	}
-
-
-	public boolean isUnique() {
-		return this.end.isUnique();
-	}
-
-	
-	public AbstractClassModel getTypeModel() {
-		if (getType().isArtifact() && !getType().getFullyQualifiedName().startsWith("primitive") ){
-    		AbstractClassModel type = ModelFactory.getInstance().getModel(getType().getArtifact());
-    		type.setPluginRef(this.getPluginRef());
-    		return type;
-		}
-		//AbstractClassModel type = new AbstractClassModel();
-		return null;
-	}
-	
-	public AssociationEndFacade getOtherEnd(){
-		AssociationEndFacade oEnd = new AssociationEndFacade( (IAssociationEnd) this.end.getOtherEnd());
-		oEnd.setPluginRef(this.getPluginRef());
-		oEnd.setParentModel(this.getParentModel());
-		return oEnd;
-		
-	}
-    
-	
-	
-	public boolean isComposition(){
-		return this.end.getAggregation().equals(EAggregationEnum.COMPOSITE);		
-	}
-	
-	public boolean isAggregation() {
-		return this.end.getAggregation().equals(EAggregationEnum.SHARED);
-	}
-	
-	public boolean isOne2One(){
-		boolean one = this.end.getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-			this.end.getMultiplicity().equals(EMultiplicity.ONE);
-		boolean otherOne = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-			getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE);;
-		return one && otherOne;
-	}
-	
-    public boolean isOne2Many(){
-    	boolean one = this.end.getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-			this.end.getMultiplicity().equals(EMultiplicity.ONE);
-    	boolean otherMany = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    	    getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    	    getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.STAR);
-        	
-    	return one && otherMany;
-	}
-	
-    public boolean isMany(){
-    	boolean many = this.getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    		this.getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    		this.getMultiplicity().equals(EMultiplicity.STAR);
-    	return many;
-	}
-    
-    
-    public boolean isMany2One(){
-    	boolean many = this.end.getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.STAR);
-    	boolean otherOne = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_ONE) ||
-		getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE);;
-    	return many & otherOne;
-	}
-    
-    public boolean isMany2Many(){
-    	boolean many = this.end.getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-    		this.end.getMultiplicity().equals(EMultiplicity.STAR);
-    	boolean otherMany = getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-	    	getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-	    	getOtherEnd().getAssociationEnd().getMultiplicity().equals(EMultiplicity.STAR);
-    	return many & otherMany;
-	}
-    
-    
-
-	public IAssociationEnd getAssociationEnd() {
-		return end;
-	}
-
-    
-    public boolean isAssociationEnd(){
-    	return true;
-    }
-    
-
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-
-		
-	@Override
-	public IPluginConfig getPluginRef() {
-		return this.getParentModel().getPluginRef();
-	}
-    
-}
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationModel.java
deleted file mode 100644
index fdaf054..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/AssociationModel.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-
-
-public class AssociationModel extends AbstractClassModel {
-	
-	private IAssociationArtifact association;
-	
-	public AssociationModel() {
-		super();
-	}
-
-	public AssociationModel(IAbstractArtifact artifact) {
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-	    super.build(artifact);
-	    this.association = (IAssociationArtifact) artifact;
-	}
-	
-	public AssociationEndFacade getAEnd(){
-		AssociationEndFacade end = new AssociationEndFacade(this.association.getAEnd());
-		end.setParentModel(this);
-		return end;
-	}
-	
-	public AssociationEndFacade getZEnd(){
-		AssociationEndFacade end = new AssociationEndFacade(this.association.getZEnd());
-		end.setParentModel(this);
-		return end;
-	}
-	
-    //	========= Additional features for UML Associations =====//
-	
-	public Collection getAssociationEnds(){
-		ArrayList ends= new ArrayList();
-		ends.add( getAEnd() );
-		ends.add( getZEnd() );
-		return ends;
-	}
-	
-	public AssociationEndFacade getAssociationEndA(){
-		return getAEnd();
-	}
-	
-	public AssociationEndFacade getAssociationEndB(){
-		return getZEnd();
-	}
-    
-}
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DatatypeModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DatatypeModel.java
deleted file mode 100644
index 9f08190..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DatatypeModel.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-
-
-public class DatatypeModel extends AbstractClassModel {
-
-	private IDatatypeArtifact datatypeArtifact;
-	
-	public DatatypeModel() {
-	}
-	
-	public DatatypeModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.datatypeArtifact = (IDatatypeArtifact) artifact;
-	}
-    
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DependencyModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DependencyModel.java
deleted file mode 100644
index 61d5c22..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/DependencyModel.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-
-
-
-public class DependencyModel extends AbstractClassModel {
-
-	
-	private IDependencyArtifact dependencyArtifact;
-	
-	public DependencyModel() {
-	}
-	
-	public DependencyModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.dependencyArtifact = (IDependencyArtifact) artifact;
-	}
-	
-	public String getAEndType(){
-		return dependencyArtifact.getAEndType().getFullyQualifiedName();
-	}
-	
-	public String getZEndType(){
-		return dependencyArtifact.getZEndType().getFullyQualifiedName();
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/EnumerationModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/EnumerationModel.java
deleted file mode 100644
index 5a55a3d..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/EnumerationModel.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ILiteral;
-
-
-public class EnumerationModel extends AbstractClassModel {
-	
-	private IEnumArtifact enumArtifact;
-	
-	public EnumerationModel() {
-	}
-
-	public EnumerationModel(IAbstractArtifact artifact) {
-		build(artifact);
-	}
-	
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.enumArtifact = (IEnumArtifact) artifact;
-	}
-	
-	public String getBaseTypeStr(){
-		return enumArtifact.getBaseTypeStr();
-	}
-	
-    //	========= Additional features for UML Enumerations =====//
-
-	/** 
-	 * rename & recast for getLabels 
-	 * 
-	 */
-	public Collection getLiterals(){
-		Collection<LabelFacade> facades = new ArrayList<LabelFacade>();
-		for (ILiteral literal : getArtifact().getLiterals(true)){
-			
-			LabelFacade facade = new LabelFacade( literal );
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ExceptionModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ExceptionModel.java
deleted file mode 100644
index 2937995..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ExceptionModel.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact;
-
-
-
-public class ExceptionModel extends AbstractClassModel {
-
-	private IExceptionArtifact exceptionArtifact;
-	
-	public ExceptionModel() {
-	}
-
-	
-	public ExceptionModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-	
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.exceptionArtifact = (IExceptionArtifact) artifact;
-	}
-    
-    public AbstractClassModel getGeneralization(){
-    	IExceptionArtifact bob = this.exceptionArtifact;
-    	if (bob.getExtendedArtifact() != null){
-			AbstractClassModel acm = ModelFactory.getInstance().getModel(bob.getExtendedArtifact());
-			acm.setPluginRef(this.getPluginRef());
-			if(acm.getFullyQualifiedName().equals("java.lang.Exception"))
-			return null;
-			else
-			return acm;
-		} else {
-			return null; 
-		}	 
-    }
-    
-}
-
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/FieldFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/FieldFacade.java
deleted file mode 100644
index 55fb72b..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/FieldFacade.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IField;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-
-public class FieldFacade extends AbstractComponentModel {
-
-	private IField field;
-	private AbstractClassModel parentModel;
-	
-	public FieldFacade(){
-		super();
-	}
-	
-	public FieldFacade(IField field) {
-		build(field);
-	}
-	
-	public void build(IField field) {
-		super.build(field);
-		this.field = field;
-	}
-	
-	public IType getType() {
-		return field.getType();
-	}
-
-
-	public boolean isOptional() {
-		return this.getLowerMultiplicity().equals("0");
-	}
-
-	public boolean isReadOnly() {
-		return field.isReadOnly();
-	}
-	
-	public IAbstractArtifact getContainingArtifact() {
-		return this.field.getContainingArtifact();
-	}
-	
-
-	public boolean isOrdered() {
-		return this.field.isOrdered();
-	}
-
-	public boolean isUnique() {
-		return this.field.isUnique();
-	}
-	
-	
-	public String getFullyQualifiedName(){
-		
-		return this.getContainingArtifact().getFullyQualifiedName() + "." + super.getName();
-
-	}
-
-	
-	/**
-	 * Return true if this has "multiplicity" anything other than SINGLE
-	 */
-	public boolean isMany(){
-		
-		boolean many = this.getType().getTypeMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-		this.getType().getTypeMultiplicity().equals(EMultiplicity.STAR);
-		
-		return many;
-	}
-    
-    
-    public AbstractClassModel getTypeModel(){
-    	if (getType().isArtifact()
-    			&& !getType().getFullyQualifiedName().startsWith("primitive") 
-    			&& !getType().isPrimitive() ){
-    		AbstractClassModel model = ModelFactory.getInstance().getModel(getType().getArtifact());
-    		model.setPluginRef(this.getPluginRef());
-    		return model;
-    	}
-		return null;
-	}  
-	
-	/**
-	 * The opposite of isOptional
-	 * 
-	 * @return
-	 */
-	public boolean isRequired(){
-		return !isOptional();
-	}	
-	
-	
-	/**
-	 * String based on the value of "defaultValue" stereotype
-	 * 
-	 * @return
-	 */
-	public String getDefaultValue(){
-		if (isDefaultValuePresent()){
-			return field.getDefaultValue();
-		} else
-			return null;
-	}
-	
-	/**
-	 * String based on the presence of "defaultValue" stereotype
-	 * 
-	 * @return
-	 */
-	public boolean isDefaultValuePresent(){
-		return (field.getDefaultValue() != null );
-	}
-
-	/**
-	* "Getter" for lowerMultiplicity.
-	* No comment found in UML.
-	*/
-    public java.lang.String getLowerMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	* 
-	* NOTE - Better the use the typed version below!
-	*/
-	public java.lang.String getUpperMultiplicity(){
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return "unbounded";
-    	case STAR:
-    		return "unbounded";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "unbounded";
-    	default:
-    		return "unbounded";
-    	}
-	    }
-	
-	public java.lang.String getMultiplicity(){
-		EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0..1";
-    	case ZERO_STAR:
-    		return "*";
-    	case STAR:
-    		return "*";
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return "1..*";
-    	default:
-    		return "unknown";
-    	}
-	}
-	
-	
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-
-	public boolean isField(){
-		return true;
-	}
-	
-	
-	public String toString(){
-		return this.getClass().getName()+"["+field.getName()+"]";
-	}
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-
-	public AbstractClassModel getOwner(){
-		AbstractClassModel model = ModelFactory.getInstance().getModel(field.getContainingArtifact());
-		model.setPluginRef(this.getPluginRef());
-		return model;
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/LabelFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/LabelFacade.java
deleted file mode 100644
index 0db03c6..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/LabelFacade.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ILiteral;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-
-public class LabelFacade extends AbstractComponentModel {
-	
-	private ILiteral label;
-	private AbstractClassModel parentModel;
-	
-	public LabelFacade(){
-	}
-	
-	public LabelFacade(ILiteral label) {
-		build(label);
-	}
-	
-	public void build(ILiteral label) {
-		super.build(label);
-		this.label = label;
-	}
-	
-	public IType getIextType() {
-		return label.getType();
-	}
-
-
-	public String getValue() {
-		return label.getValue();
-	}
-	
-	
-	public IAbstractArtifact getContainingArtifact() {
-		return this.label.getContainingArtifact();
-	}
-
-
-	
-	public int getIndexValue() {
-		int ret = -1;
-		//Object o = this.findTaggedValue("EnumValue");
-		Object o = getValue();
-		if (o != null) {
-			ret = Integer.parseInt(o.toString());
-		}
-		return ret;
-	}
-	
-	public AbstractClassModel getOwner(){
-		AbstractClassModel model = ModelFactory.getInstance().getModel(label.getContainingArtifact());
-		model.setPluginRef(this.getPluginRef());
-		return model;
-	}
-	
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ManagedEntityModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ManagedEntityModel.java
deleted file mode 100644
index 1741051..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ManagedEntityModel.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-
-
-public class ManagedEntityModel extends AbstractClassModel {
-		
-	private IManagedEntityArtifact managedEntityArtifact;
-
-	public ManagedEntityModel() {
-		super();
-	}
-	
-	public ManagedEntityModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.managedEntityArtifact = (IManagedEntityArtifact) artifact;
-	}
-    
-    
-    
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/MethodFacade.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/MethodFacade.java
deleted file mode 100644
index 20ab6e5..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/MethodFacade.java
+++ /dev/null
@@ -1,391 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IType;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IArgument;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IModelComponent.EMultiplicity;
-import org.eclipse.tigerstripe.workbench.profile.stereotype.IStereotypeInstance;
-
-public class MethodFacade extends AbstractComponentModel {
-
-	
-	private IMethod method;
-	
-	private AbstractClassModel parentModel;
-
-	public MethodFacade(){
-		super();
-	}
-
-	public MethodFacade(IMethod method) {
-		build(method);
-	}
-
-	public void build(IMethod method) {
-		super.build(method);
-		this.method = method;
-	}
-	
-	public Collection<IArgument> getArguments() {
-		return method.getArguments();
-	}
-
-	public String getMethodId() {
-		return method.getMethodId();
-	}
-
-	public boolean isMethod() {
-		return true;
-	}
-	
-	public IType getReturnType() {
-		return method.getReturnType();
-	}
-
-	public boolean isVoid() {
-		return method.isVoid();
-	}
-
-	public IAbstractArtifact getContainingArtifact() {
-		return this.method.getContainingArtifact();
-	}
-	
-	public String getDefaultReturnValue() {
-		return this.method.getDefaultReturnValue();
-	}
-
-	public boolean isAbstract() {
-		return this.method.isAbstract();
-	}
-
-	public boolean isOrdered() {
-		return this.method.isOrdered();
-	}
-
-	public boolean isUnique() {
-		return this.method.isUnique();
-	}
-    
-	public String getReturnName(){
-		return getMethodReturnName();
-	}
-	
-	public String getMethodReturnName() {
-		return this.method.getReturnName();
-	}
-
-	public Collection<IStereotypeInstance> getReturnStereotypeInstances() {
-		return this.method.getReturnStereotypeInstances();
-	}
-	
-	
-	/**
-	 * Return true if this has "multiplicity" anything other than SINGLE
-	 */
-	public boolean returnIsMany(){
-		
-		boolean many = this.getReturnType().getTypeMultiplicity().equals(EMultiplicity.ZERO_STAR) ||
-		this.getReturnType().getTypeMultiplicity().equals(EMultiplicity.ONE_STAR) ||
-		this.getReturnType().getTypeMultiplicity().equals(EMultiplicity.STAR);
-		
-		return many;
-	}
-	
-	
-	
-	public String getPackage(){
-		return getContainingArtifact().getPackage();
-	}
-	
-	
-	
-	
-	public boolean returnParameterHasStereotype( String stereotypeName){
-		if(this.getReturnStereotypeInstances() != null){
-		Collection<IStereotypeInstance> stereos = this.getReturnStereotypeInstances();
-		for (IStereotypeInstance stereo : stereos){
-			if (stereo.getName().equals(stereotypeName)) {
-					return true;
-			}
-		}
-		return false;
-		}
-		return false;
-	}
-
-
-	
-	public boolean isReturnTypePresent(){
-		return !isVoid();
-	}
-	
-	
-	
-	public  Collection getExceptions() {
-		Collection<AbstractClassModel> facades = new ArrayList<AbstractClassModel>();
-		for (IException exception : method.getExceptions()){
-			AbstractClassModel facade = ModelFactory.getInstance().getModel(exception);
-			if (facade != null){
-				facade.setPluginRef(this.getPluginRef());
-				facades.add(facade);
-			}
-		}
-		return facades;
-	}
-	
-	public boolean isExceptionsPresent(){
-		if (method.getExceptions().size() == 0){
-			return false;
-		} else {
-			return true;
-		}
-	}
-	
-	/**
-	 * Formatted String list of the exceptions
-	 * @return
-	 */
-	public String getExceptionList(){
-		String outString = "";
-		String comma = " ";
-		Iterator it = method.getExceptions().iterator();
-		while (it.hasNext()){
-		    IException exception = (IException) it.next();
-			
-			outString = outString + comma+exception.getName() ;
-			if (it.hasNext()){
-				outString = outString +"\n"; 
-			}
-			comma = ",";
-		}
-		
-	
-		return outString;
-	}
-	
-	/**
-	 * Formatted string of the method signature
-	 * @return
-	 */
-	public String getSignature(){
-		String sig = "";
-		sig = method.getName()+"(";
-		sig = sig + getTypedArgumentList();
-		sig = sig+")";
-		return sig;
-	}
-
-	/** 
-	 * rename & recast for getIextArguments 
-	 * 
-	 */
-	public Collection getParameters(){
-		Collection<ArgumentFacade> facades = new ArrayList<ArgumentFacade>();
-		for (IArgument arg : getArguments()){
-			ArgumentFacade facade = new ArgumentFacade( arg);
-			facade.setPluginRef(this.getPluginRef());
-			facade.setParentModel(this.getParentModel());
-			facades.add(facade);
-		}
-		return facades;
-	}
-	
-	/**
-	 * Formatted list of the arguments & types
-	 * @return
-	 */
-	public String getTypedArgumentList(){
-		String argList = "";
-		String comma = " ";
-		int arg =0;
-		for (IArgument argument : method.getArguments()){
-			argList = argList + comma + argument.getType().getFullyQualifiedName()
-				+ " arg"+arg;
-			comma = "        ,\n";
-			arg++;
-		}
-		return argList;
-	}
-	
-	
-	public AbstractClassModel getOwner(){
-		AbstractClassModel model = ModelFactory.getInstance().getModel(method.getContainingArtifact());
-		model.setPluginRef(this.getPluginRef());
-		return model;
-	}
-	
-	
-	public AbstractClassModel getReturnTypeModel(){
-		if (getReturnType().isArtifact() 
-				&& !getReturnType().getFullyQualifiedName().startsWith("primitive")
-				&& ! getReturnType().isPrimitive()){
-    		AbstractClassModel model = ModelFactory.getInstance().getModel(getReturnType().getArtifact());
-    		model.setPluginRef(this.getPluginRef());
-    		return model;
-    	}
-		return null;
-	}
-	
-
-	public boolean hasReturnExactStereotype( String stereotypeName){
-
-		Collection<IStereotypeInstance> stereos = getReturnStereotypeInstances();
-		for (IStereotypeInstance stereo :stereos){
-			if (stereo.getName().equals(stereotypeName)) {
-				return true;
-			}
-		}
-		return false;
-	}
-
-	/**
-	* "Getter" for upperMultiplicity.
-	* No comment found in UML.
-	*/
-	public java.lang.String getReturnUpperMultiplicity(){
-		EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-		switch (multi) {
-		case ZERO:
-			return "0";
-		case ZERO_ONE:
-			return "1";
-		case ZERO_STAR:
-			return "unbounded";
-		case STAR:
-			return "unbounded";
-		case ONE:
-			return "1";
-		case ONE_STAR:
-			return "unbounded";
-		default:
-			return "unbounded";
-		}
-	    }
-	
-	public java.lang.String getReturnMultiplicity(){
-		EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-		switch (multi) {
-		case ZERO:
-			return "0";
-		case ZERO_ONE:
-			return "0..1";
-		case ZERO_STAR:
-			return "0..*";
-		case STAR:
-			return "*";
-		case ONE:
-			return "1";
-		case ONE_STAR:
-			return "1..*";
-		default:
-			return "unknown";
-		}
-	    }
-	
-	public boolean isReturnMultiMany(){
-		EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-		switch (multi) {
-		case ZERO:
-			return false;
-		case ZERO_ONE:
-			return false;
-		case ZERO_STAR:
-			return true;
-		case STAR:
-			return true;
-		case ONE:
-			return false;
-		case ONE_STAR:
-			return true;
-		default:
-			return false;
-		}
-	}
-	
-	
-	public java.lang.String getReturnUpperMultiplicity(String type){
-		String maxString = "";
-		if (type.equals("xml")){
-			maxString = "unbounded";
-		} else {
-			maxString = "-1";
-		}
-    	EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "1";
-    	case ZERO_STAR:
-    		return maxString;
-    	case STAR:
-    		return maxString;
-    	case ONE:
-    		return "1";
-    	case ONE_STAR:
-    		return maxString;
-    	default:
-    		return maxString;
-    	}
-	    }
-	
-	
-	/**
-	* "Getter" for lowerMultiplicity.
-	* No comment found in UML.
-	*/
-    public java.lang.String getReturnLowerMultiplicity(){
-    	EMultiplicity multi = this.getReturnType().getTypeMultiplicity();
-    	switch (multi) {
-    	case ZERO:
-    		return "0";
-    	case ZERO_ONE:
-    		return "0";
-    	case ZERO_STAR:
-    		return "0";
-    	case STAR:
-    		return "0";
-    	default:
-    		return "1";
-    	}
-
-    }
-    
-
-	/**
-	 * @return the parentModel
-	 */
-	public AbstractClassModel getParentModel() {
-		return parentModel;
-	}
-
-	/**
-	 * @param parentModel the parentModel to set
-	 */
-	public void setParentModel(AbstractClassModel parentModel) {
-		this.parentModel = parentModel;
-	}
-    
-    
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ModelFactory.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ModelFactory.java
deleted file mode 100644
index bc89db3..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/ModelFactory.java
+++ /dev/null
@@ -1,119 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDatatypeArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEnumArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEventArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IExceptionArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IUpdateProcedureArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IMethod.IException;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-
-import org.eclipse.tigerstripe.generators.utils.DocUtils;
-
-public class ModelFactory{
-
-	private static ModelFactory instance;
-	
-	/**
-	 * A Private Map that keeps track of all of the instances created
-	 */
-	private Map<String, AbstractClassModel> modelMap = new HashMap<String, AbstractClassModel>();
-
-	private ModelFactory() {
-	}
-
-	public static ModelFactory getInstance() {
-		if (instance == null) {
-			instance = new ModelFactory();
-		}
-		return instance;
-	}
-
-   public AbstractClassModel getModel(IAbstractArtifact artifact){
-	   
-	   /** See if it already exists */
-	   if (modelMap.containsKey(artifact.getFullyQualifiedName())){
-		   return modelMap.get(artifact.getFullyQualifiedName());
-	   }
-	   // Else create a new one
-	   AbstractClassModel newModel;
-	   if (artifact instanceof IAssociationClassArtifact){
-		   newModel = new AssociationClassModel(artifact);
-	   } else if (artifact instanceof IAssociationArtifact){
-		   newModel = new AssociationModel(artifact);
-	   } else if (artifact instanceof IDatatypeArtifact){
-		   newModel = new DatatypeModel(artifact);
-	   } else if (artifact instanceof IManagedEntityArtifact){
-		   newModel = new ManagedEntityModel(artifact);
-	   } else if (artifact instanceof IEnumArtifact){
-		   newModel = new EnumerationModel(artifact);
-	   }else if (artifact instanceof ISessionArtifact){
-		   newModel = new SessionModel(artifact);
-	   }else if (artifact instanceof IExceptionArtifact){
-		   newModel = new ExceptionModel(artifact);
-	   }else if (artifact instanceof IDependencyArtifact){
-		   newModel = new DependencyModel(artifact);
-	   }else if (artifact instanceof IQueryArtifact){
-		   newModel = new QueryModel(artifact);
-	   }else if (artifact instanceof IUpdateProcedureArtifact){
-		   newModel = new UpdateProcedureModel(artifact);
-	   }else if (artifact instanceof IEventArtifact){
-		   newModel = new NotificationModel(artifact);
-	   } else {
-		   PluginLog.logError("ModelFactory : Unknown artifact type for "+artifact.getFullyQualifiedName());
-		   newModel = null;
-	   }
-	   modelMap.put(artifact.getFullyQualifiedName(), newModel);
-	   return newModel;
-   }   
-
-   /**
-    * Special case for creating an exceptionModel from anIextException (which is not an artifact)
-    * 
-    * @param exception
-    * @return
-    */
-   public AbstractClassModel getModel(IException exception){
-	   
-	   /** See if it already exists */
-	   if (modelMap.containsKey(exception.getFullyQualifiedName())){
-		   return modelMap.get(exception.getFullyQualifiedName());
-	   }
-	       IArtifactManagerSession managerSession = DocUtils.getManagerSession();
-	       if (managerSession != null){
-	    	   IExceptionArtifact artifact = (IExceptionArtifact) managerSession.getArtifactByFullyQualifiedName(exception.getFullyQualifiedName(),true);
-	    	   if (artifact != null){
-	    		   ExceptionModel newModel = new ExceptionModel(artifact);
-	    		   modelMap.put(artifact.getFullyQualifiedName(), newModel);
-	    		   return newModel;
-	    	   }
-	       }
-	       // This will return null if there is not an artifact for this exception
-	       PluginLog.logWarning("ModelFactory : No artifact type for exception"+exception.getFullyQualifiedName());
-	       return null;
-		   
-   }
-}
-
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/NotificationModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/NotificationModel.java
deleted file mode 100644
index 518925f..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/NotificationModel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IEventArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact;
-
-
-public class NotificationModel extends AbstractClassModel {
-
-	private IEventArtifact notificationArtifact;
-	
-	public NotificationModel() {
-	}
-	
-	public NotificationModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.notificationArtifact = (IEventArtifact) artifact;
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/PackageModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/PackageModel.java
deleted file mode 100644
index d326ff7..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/PackageModel.java
+++ /dev/null
@@ -1,157 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.generators.utils.DocUtils;
-import org.eclipse.tigerstripe.workbench.TigerstripeException;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactModel;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-import org.eclipse.tigerstripe.workbench.project.ITigerstripeModelProject;
-import org.eclipse.tigerstripe.workbench.queries.IArtifactQuery;
-import org.eclipse.tigerstripe.workbench.queries.IQueryAllArtifacts;
-
-import org.eclipse.tigerstripe.generators.models.AbstractClassModel;
-import org.eclipse.tigerstripe.generators.models.ModelFactory;
-
-/**
- * This class is used to "spoof" a package when a rule needs to run over all artifacts 
- * in a given package.
- * 
- * The package is taken from the artifact that is passed in the setIArtifact.
- * 
- * When this is used in a rule, the rule should be set to not overwrite to prevent 
- * unnecessary processing.
- * 
- *
- */
-public class PackageModel implements IArtifactModel{
-
-	private IAbstractArtifact artifact;
-	private IPluginConfig pluginRef;
-
-	private String fullyQualifiedName;
-	
-	public PackageModel(){
-		
-	}
-	
-	public void setIArtifact(IAbstractArtifact artifact) {
-		this.artifact = artifact;
-		this.fullyQualifiedName = artifact.getPackage();
-	}
-
-	public void setPluginConfig(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-		
-	}
-
-	public String getFullyQualifiedName() {
-		return fullyQualifiedName;
-	}
-
-	public String getName() {
-		return getFullyQualifiedName().substring(getFullyQualifiedName().lastIndexOf(".")+1);
-	}
-	
-	/**
-	 * This will do a lot of work every time called. If necessary it could be made more efficient?
-	 * 
-	 * @return
-	 */
-	public Collection<AbstractClassModel> getOwnedElements(Collection<PackageModel> allArtifacts){
-		PluginLog.logDebug("does it make it here");
-		ArrayList<AbstractClassModel> ownedElements = new ArrayList<AbstractClassModel>();
-		try {
-			//ITigerstripeModelProject project = artifact.getTigerstripeProject();
-			//IArtifactManagerSession session = project.getArtifactManagerSession();
-			//IArtifactQuery query = session.makeQuery(IQueryAllArtifacts.class.getName());
-			//Collection allArtifacts = session.queryArtifact(query);
-			for (Object art : allArtifacts){
-				IAbstractArtifact localArtifact = (IAbstractArtifact) art;
-				if (localArtifact.getPackage().equals(getFullyQualifiedName())){
-					PluginLog.logDebug("Adding "+localArtifact.getName()+ " to ownedElements of "+getFullyQualifiedName());
-					AbstractClassModel model = ModelFactory.getInstance().getModel(localArtifact);
-					model.setPluginRef(this.pluginRef);
-					ownedElements.add(model);
-				}
-				
-			}
-		} catch (NullPointerException n){
-			PluginLog.logError("Failure to read package artifacts - no project");
-		} //catch (TigerstripeException t){
-		//	PluginLog.logError("Failure to read package artifacts",t);
-		//}
-		return ownedElements;
-
-	}
-	
-	public String getHash(){
-		return DocUtils.getHash(getFullyQualifiedName());
-	}
-
-	public Collection<PackageModel> getSubPackages(){
-		ArrayList<PackageModel> subPackages = new ArrayList<PackageModel>();
-		ArrayList<String> subPackageNames = new ArrayList<String>();
-		
-		try {
-			// This *might* not work for a project with dependencies
-			ITigerstripeModelProject project = artifact.getTigerstripeProject();
-			IArtifactManagerSession session = project.getArtifactManagerSession();
-			IArtifactQuery query = session.makeQuery(IQueryAllArtifacts.class.getName());
-			Collection allArtifacts = session.queryArtifact(query);
-			for (Object art : allArtifacts){
-				IAbstractArtifact localArtifact = (IAbstractArtifact) art;
-				if (localArtifact.getPackage().startsWith(getFullyQualifiedName())){
-					String subPackage = localArtifact.getPackage().replaceFirst(getFullyQualifiedName(), "");
-			
-					if ( subPackage.length() > 0 ){
-						// We need to add a new subPackage here
-						String newPackageName = subPackage.substring(1);
-						if (newPackageName.contains(".")){
-							newPackageName = newPackageName.substring(0,newPackageName.indexOf("."));
-						}
-						
-						if (!subPackageNames.contains(newPackageName)){
-							// There might be no artifact at this level of the hierarchy, so set the name directly
-							PluginLog.logDebug("Adding "+newPackageName+ " to subPackages of "+getFullyQualifiedName());
-							PackageModel model = new PackageModel();
-							model.setIArtifact(localArtifact);
-							// Must do this AFTER setting the artifact
-							model.setFullyQualifiedName(getFullyQualifiedName()+"."+newPackageName);
-							model.setPluginConfig(this.pluginRef);
-							subPackages.add(model);
-							subPackageNames.add(newPackageName);
-						}
-					}
-					
-				}
-				
-			}
-		} catch (NullPointerException n){
-			PluginLog.logError("Failure to read package artifacts - no project");
-		} catch (TigerstripeException t){
-			PluginLog.logError("Failure to read package artifacts",t);
-		}
-		return subPackages;
-	}
-
-	private void setFullyQualifiedName(String fullyQualifiedName) {
-		this.fullyQualifiedName = fullyQualifiedName;
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/QueryModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/QueryModel.java
deleted file mode 100644
index 80382be..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/QueryModel.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IQueryArtifact;
-
-
-public class QueryModel extends AbstractClassModel {
-
-	private IQueryArtifact queryArtifact;
-	
-	public QueryModel() {
-	}
-	
-	public QueryModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.queryArtifact = (IQueryArtifact) artifact;
-	}
-	
-	public String getReturnedType(){
-		if (this.queryArtifact.getReturnedType() != null ){
-			AbstractClassModel acm = ModelFactory.getInstance().getModel(this.queryArtifact.getReturnedType().getArtifact());
-			acm.setPluginRef(this.getPluginRef());
-			return acm.getFullyQualifiedName();
-		} else {
-			return null;
-		}
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/SessionModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/SessionModel.java
deleted file mode 100644
index 18f70a5..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/SessionModel.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact;
-
-public class SessionModel extends AbstractClassModel {
-	
-	private ISessionArtifact sessionArtifact;
-	
-	public SessionModel(){}
-	
-	public SessionModel(IAbstractArtifact artifact){
-		build(artifact);
-	}
-	
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.sessionArtifact = (ISessionArtifact) artifact;
-	}
-	
-
-    public boolean isInterface(){
-    	return true;
-    }
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/UpdateProcedureModel.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/UpdateProcedureModel.java
deleted file mode 100644
index 21b3f90..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/models/UpdateProcedureModel.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.models;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IUpdateProcedureArtifact;
-
-
-
-public class UpdateProcedureModel extends AbstractClassModel {
-
-	private IUpdateProcedureArtifact updateProcedureArtifact;
-	
-	public UpdateProcedureModel() {
-	}
-	
-	public UpdateProcedureModel(IAbstractArtifact artifact ){
-		build(artifact);
-	}
-
-	protected void build(IAbstractArtifact artifact){
-		super.build(artifact);
-		this.updateProcedureArtifact = (IUpdateProcedureArtifact) artifact;
-	}
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/CastUtils.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/CastUtils.java
deleted file mode 100644
index 963ffb6..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/CastUtils.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.project.IPluginConfig;
-
-import org.eclipse.tigerstripe.generators.models.AbstractClassModel;
-import org.eclipse.tigerstripe.generators.models.ModelFactory;
-
-
-public class CastUtils {
-
-	private LegacyFilter legacyFilter = new LegacyFilter();
-
-	private IPluginConfig pluginRef = null;
-
-
-	public Collection toModel(Collection<IAbstractArtifact> artifacts){
-		ArrayList<AbstractClassModel> outCollection = new ArrayList<AbstractClassModel>();
-		for (IAbstractArtifact artifact : artifacts){
-			if (legacyFilter.select(artifact)){
-				AbstractClassModel model = ModelFactory.getInstance().getModel(artifact);
-				if (model != null){
-					model.setPluginRef(pluginRef);
-					outCollection.add( model);
-				}
-			}
-		}
-		return outCollection;
-	}	
-
-	public void setPluginRef(IPluginConfig pluginRef) {
-		this.pluginRef = pluginRef;
-	}
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocPackage.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocPackage.java
deleted file mode 100644
index 4db4f3f..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocPackage.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-
-
-public class DocPackage {
-
-	private String fullyQualifiedName;
-	public  boolean elements = false;
-	private Map<String,DocPackage> subPackageMap = new HashMap<String,DocPackage>();
-	
-	
-	public String getFullyQualifiedName() {
-		return this.fullyQualifiedName;
-	}
-	
-	public String getName() {
-		return getFullyQualifiedName().substring(getFullyQualifiedName().lastIndexOf(".")+1);
-	}
-	
-	public void setFullyQualifiedName(String fqn) {
-		this.fullyQualifiedName = fqn;
-	}
-	
-	public Collection<DocPackage> getSubPackages() {
-		return DocUtils.sortByName(subPackageMap.values());
-	}
-	public void addSubPackage(DocPackage packageToAdd) {
-		if (! subPackageMap.containsKey(packageToAdd.getFullyQualifiedName())){
-			PluginLog.logDebug("Adding sub package"+packageToAdd.getFullyQualifiedName()+ " to "+getFullyQualifiedName());
-			subPackageMap.put(packageToAdd.getFullyQualifiedName(), packageToAdd);
-		}
-	}
-
-	public boolean hasElements() {
-		return elements;
-	}
-
-	public void setElements(boolean elements) {
-		
-		this.elements = elements;
-	}
-	
-	
-	
-	
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocUtils.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocUtils.java
deleted file mode 100644
index ed8b040..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/DocUtils.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IArtifactManagerSession;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAssociationClassArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IDependencyArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IManagedEntityArtifact;
-import org.eclipse.tigerstripe.workbench.model.deprecated_.ISessionArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-import org.eclipse.tigerstripe.workbench.queries.IArtifactQuery;
-import org.eclipse.tigerstripe.workbench.queries.IQueryAllArtifacts;
-
-import org.eclipse.tigerstripe.generators.models.AssociationEndFacade;
-import org.eclipse.tigerstripe.generators.utils.LegacyFilter;
-
-import org.eclipse.tigerstripe.generators.models.AbstractComponentModel;
-import org.eclipse.tigerstripe.generators.models.ArgumentFacade;
-
-public class DocUtils
-{
-
-	private static IArtifactManagerSession managerSession;
-	
-	public static IArtifactManagerSession getManagerSession() {
-		return managerSession;
-	}
-
-
-	/**
-	 * Generate a simple hash based on a string
-	 */
-	public static String getHash(String input){
-		long h =0;
-		for (int i=0;i<input.length();i++){
-			h=(h<<2L) + Character.getNumericValue(input.charAt(i));
-		}
-		PluginLog.logTrace("Getting hash for "+input+ " : Returning "+Long.toHexString(h));
-		return Long.toHexString(h);
-	}
-
-	public static Collection<DocPackage> getRootPackages(IArtifactManagerSession session, Collection<Object> allArtifacts){
-		Map<String, DocPackage> packageMap = new HashMap<String, DocPackage>();
-		try {
-			//IArtifactQuery query = session.makeQuery(IQueryAllArtifacts.class.getName());
-			//Collection allArtifacts = session.queryArtifact(query);
-			// Filter out legacy artifacts
-			for (Object art : allArtifacts){
-				//LegacyFilter filter = new LegacyFilter();
-				IAbstractArtifact localArtifact = (IAbstractArtifact) art;
-				//if (filter.select(localArtifact) && ! localArtifact.getPackage().equals("primitive")){
-				//if (localArtifact.getTigerstripeProject() != null && ! localArtifact.getPackage().equals("primitive")){
-				if (! localArtifact.getPackage().equals("primitive")){
-				String localPackageName = localArtifact.getPackage();
-				DocPackage myPackage;
-				if (! packageMap.containsKey(localPackageName)){
-					// make a new DocPackage
-					
-					// Also check/make all parent elements
-					String[] segments = localPackageName.split("\\.");
-					
-					String prev = "";
-					DocPackage parent = null;
-					DocPackage segmentPackage;
-					for (String segment : segments){
-						String name = prev+segment;
-
-						if (! packageMap.containsKey(name)){
-							segmentPackage= new DocPackage();
-							segmentPackage.setFullyQualifiedName(name);
-							packageMap.put(name, segmentPackage);
-						} else {
-							segmentPackage = packageMap.get(name);
-						}
-						if (parent != null){
-							parent.addSubPackage(segmentPackage);
-						}
-						prev = name + ".";
-						parent = segmentPackage;
-					}
-					// myPackage will be the last one.
-					myPackage = parent;
-				} else {
-					myPackage = packageMap.get(localPackageName);
-				}
-				
-				if (localArtifact instanceof IAbstractArtifact
-						
-						){
-					myPackage.setElements(true);
-				}
-				
-				}
-				
-			}
-		} catch (Exception e){
-			PluginLog.logError("Failure to query artifacts",e);
-		}
-
-		Collection<DocPackage> packages = sortDocPackageByName(packageMap.values());
-		Collection<DocPackage> rootPackages = new ArrayList<DocPackage>();
-		for (DocPackage p : packages){
-			if (!p.getFullyQualifiedName().contains(".")){
-				rootPackages.add(p);
-			}
-		}
-		return rootPackages;
-
-	}
-	
-	public static Collection<DocPackage> sortDocPackageByName(Collection packages) {
-    	ArrayList sorted = new ArrayList();
-
-        if (packages != null) {
-        	sorted.addAll(packages);
-	        	Collections.sort (sorted, new java.util.Comparator() {
-	            public int compare(Object arg0, Object arg1) 
-	            {
-	                if (arg0 instanceof DocPackage
-	                        && arg1 instanceof DocPackage) {
-	                	DocPackage a = (DocPackage) arg0;
-	                	DocPackage b = (DocPackage) arg1;
-	                    return a.getFullyQualifiedName().compareTo(b.getFullyQualifiedName());
-	                } else {
-	                	return 0;
-
-	                }
-	            }
-	        });
-        }
-	  	return sorted;
-
-    }
-	
-    public String getMultiplicityString(AssociationEndFacade end){
-        String ret = "";
-        ret = end.getMultiplicity().getLabel();
-        return ret;
-    }
-    
-    public static Collection sortByName(Collection attrs){
-    	ArrayList sorted = new ArrayList();
-
-        if (attrs != null) {
-        	sorted.addAll(attrs);
-	        	Collections.sort (sorted, new java.util.Comparator() {
-	            public int compare(Object arg0, Object arg1) 
-	            {
-	                if (arg0 instanceof AbstractComponentModel
-	                        && arg1 instanceof AbstractComponentModel) {
-	                	AbstractComponentModel a = (AbstractComponentModel) arg0;
-	                	AbstractComponentModel b = (AbstractComponentModel) arg1;
-	                    return a.getName().compareTo(b.getName());
-	                } else if (arg0 instanceof ArgumentFacade
-	                		&& arg1 instanceof ArgumentFacade) {
-	                	ArgumentFacade a = (ArgumentFacade) arg0;
-	                	ArgumentFacade b = (ArgumentFacade) arg1;
-	                	return a.getName().compareTo(b.getName());
-	                } else {
-	                	return 0;
-	                }
-	            }
-	        });
-        }
-	  	return sorted;
-
-    }
-	
-    public String encode(String str) {
-		  if (str == null)
-		   return "";
-
-		  StringBuffer sb = new StringBuffer();
-		  char[] data = str.toCharArray();
-		  char c, lastC = 0x0;
-		  for (char element : data) {
-		   c = element;
-		   if (c == '"') {
-		    sb.append("&quot;");
-		   } else if (c == '\'') {
-		    sb.append("&apos;");
-		   } else if (c == '<') {
-		    	sb.append("&lt;");
-		   } else if (c == '>') {
-			   sb.append("&gt;");
-		   }
-		   else if (c == '&') {
-		    sb.append("&amp;");
-		   } else if (c == '/' && lastC == '*') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&eCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else if (c == '*' && lastC == '/') { // added to handle Javadoc
-		    // comments
-		    sb.deleteCharAt(sb.length() - 1);
-		    sb.append("&bCom;");
-		    lastC = 0x0;
-		    continue;
-		   } else {
-		    sb.append(c);
-		   }
-		   lastC = c;
-		  }
-		  return sb.toString();
-		 }
-
-}
diff --git a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/LegacyFilter.java b/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/LegacyFilter.java
deleted file mode 100644
index f38bb4e..0000000
--- a/generators/tigerstripe-documentation/src/org/eclipse/tigerstripe/generators/utils/LegacyFilter.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/******************************************************************************* 
- * 
- * Copyright (c) 2008 Cisco Systems, Inc. 
- * All rights reserved. This program and the accompanying materials 
- * are made available under the terms of the Eclipse Public License v1.0 
- * which accompanies this distribution, and is available at 
- * http://www.eclipse.org/legal/epl-v10.html 
- * 
- * Contributors: 
- *    Cisco Systems, Inc. - dkeysell
-********************************************************************************/
-package org.eclipse.tigerstripe.generators.utils;
-
-import org.eclipse.tigerstripe.workbench.model.deprecated_.IAbstractArtifact;
-import org.eclipse.tigerstripe.workbench.plugins.IArtifactFilter;
-import org.eclipse.tigerstripe.workbench.plugins.PluginLog;
-
-/**
- * This can be used to prevent the oss/j legacy artifacts from appearing
- *
- */
-
-public class LegacyFilter implements IArtifactFilter {
-
-	public boolean select(IAbstractArtifact artifact) {
-		
-		if (artifact.getPackage().startsWith("java")){
-			PluginLog.logDebug("Filtered  "+artifact.getName());
-			return false;
-		} else {
-			PluginLog.logDebug("Passed  "+artifact.getName());
-			return true;
-		}
-	}
-	
-	
-
-}
diff --git a/generators/tigerstripe-documentation/templates/cTypes.vm b/generators/tigerstripe-documentation/templates/cTypes.vm
deleted file mode 100644
index 70c5bca..0000000
--- a/generators/tigerstripe-documentation/templates/cTypes.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Complex Types</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Complex Types</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allDatatypes))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/enumerations.vm b/generators/tigerstripe-documentation/templates/enumerations.vm
deleted file mode 100644
index 02481bb..0000000
--- a/generators/tigerstripe-documentation/templates/enumerations.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Enumerations</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Enumerations</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($enum in ${docUtils.sortByName($castUtils.toModel($allEnumerations))} )
-#artiDetails($enum)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/exceptions.vm b/generators/tigerstripe-documentation/templates/exceptions.vm
deleted file mode 100644
index ac4f4fa..0000000
--- a/generators/tigerstripe-documentation/templates/exceptions.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Exceptions</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Exceptions</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allExceptions))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/index.vm b/generators/tigerstripe-documentation/templates/index.vm
deleted file mode 100644
index 8ab194b..0000000
--- a/generators/tigerstripe-documentation/templates/index.vm
+++ /dev/null
@@ -1,131 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html xmlns:xdt="http://www.w3.org/2005/02/xpath-datatypes" xmlns:fn="http://www.w3.org/2005/02/xpath-functions" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:fo="http://www.w3.org/1999/XSL/Format">
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>$tsProjectHandle.ProjectDetails.Name version: $tsProjectHandle.ProjectDetails.Version Documentation</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-<!-- 
- Generated by: $templateName in ${pluginConfig.pluginId} 
--->
-</head>
-<body>
-<h1>$tsProjectHandle.ProjectDetails.Name version: $tsProjectHandle.ProjectDetails.Version Documentation</h1>
-<dl>
-<dt>Project Description</dt>
-<dd>${tsProjectHandle.ProjectDetails.Description}</dd>
-</dl>
-<h2>Index</h2>
-<dl>
-<dt><a href="#sd">Service Definitions</a></dt>
-<dd>A list of the services available from ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="#p">Package List.</a></dt>
-<dd>A description of the segmentation of ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="#e">Entity Class List.</a></dt>
-<dd>A list of the entity classes in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="enumerations.html">Enumerations</a></dt>
-<dd>A list of the enumerations in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="cTypes.html">Complex Types</a></dt>
-<dd>A list of the complex types ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="updates.html">Update Procedures</a></dt>
-<dd>A list of the Update Procedures in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="notifications.html">Notifications</a></dt>
-<dd>A list of the Notifications in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="queries.html">Queries</a></dt>
-<dd>A list of the Queries in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-<dt><a href="exceptions.html">Exceptions</a></dt>
-<dd>A list of the Exceptions in ${tsProjectHandle.ProjectDetails.Name}.</dd>
-</dl>
-
-
-## Package hierarchy
-<h2><a name="p">Package List</a></h2>
-A description of the segmentation of ${tsProjectHandle.ProjectDetails.Name}.
-<ul>
-#foreach ($p in $docUtils.getRootPackages($managerSession, $allArtifacts))
-#package($p)
-#end
-</ul>
-## Class hierarchy
-<h2><a name="e">Entity Class List</a></h2>
-<p>A list of the entity classes in the ${tsProjectHandle.ProjectDetails.Name}. Entries in <i>italics</i> are abstract.</p>
-#foreach ($i in $docUtils.sortByName($castUtils.toModel($allEntities)))
-#href($i)#generals($i)<br/>
-#end
-
-<h2><a name="sd">Service Definitions</a></h2>
-A list of the services available from ${tsProjectHandle.ProjectDetails.Name}.
-<ul>
-#foreach ($s in $docUtils.sortByName($castUtils.toModel($allSessions)))
-<li>#href($s) #if(${s.inheritedOperations.size()}>0)has operations#end</li><ul>
-#foreach($o in $docUtils.sortByName(${s.inheritedOperations}))
-    <li>#href($o)</li>
-#end
-</ul>
-#set($ec=false)
-#foreach($e in $castUtils.toModel($allEntities))
-#foreach($i in $e.implements)
-#if($i == $s)
-#set($ec = true)
-#end
-#end
-#end
-#if($ec==true)
-Interface $s.name is implemented by:
-<ul>
-#foreach($e in $docUtils.sortByName($castUtils.toModel($allEntities)))
-#foreach($i in $e.implements)
-#if($i == $s)
-    <li>#href($e)#if(${e.inheritedOperations.size()}>0)has operations#end</li><ul>
-#foreach($o in $docUtils.sortByName($e.inheritedOperations))
-        <li>#href($o)</li>
-#end
-#end
-#end
-</ul>
-#end
-</ul>
-#end
-#if(${s.getArtifact().ManagedEntityDetails.size()}>0)
-Interface $s.name exposes:
-<ul>
-#foreach($e in ${s.getArtifact().ManagedEntityDetails})
-#foreach($a in $docUtils.sortByName($castUtils.toModel($allEntities)))
-#if($a.fullyQualifiedName.equals($e.fullyQualifiedName))
-    <li>#href($a)#if(${a.inheritedOperations.size()}>0)has operations#end</li><ul>
-#foreach($o in $a.inheritedOperations)
-        <li>#href($o)</li>
-#end
-</ul>
-#end
-#end
-#end
-</ul>
-#end
-
-#if(${s.getArtifact().EmittedEvents.size()}>0)
-Interface $s.name emits:
-<ul>
-#foreach($e in ${s.getArtifact().EmittedEvents})
-#foreach($a in $docUtils.sortByName($castUtils.toModel($allEvents)))
-#if($a.fullyQualifiedName.equals($e.fullyQualifiedName))
-    <li>#href($a)</li>
-#end
-#end
-#end
-</ul>
-#end
-
-#end
-</ul>
-<p/>
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/indexMacros.vm b/generators/tigerstripe-documentation/templates/indexMacros.vm
deleted file mode 100644
index 6fdeaba..0000000
--- a/generators/tigerstripe-documentation/templates/indexMacros.vm
+++ /dev/null
@@ -1,35 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#############################################
-## recurse package stucture
-#############################################
-#macro(package $p1)
-#if ($p1.hasElements())
-#set ($hash=${docUtils.getHash($p1.fullyQualifiedName)})
-<li><a href="pack${hash}.html">$p1.name</a></li>
-#else
-<li>$p1.name</li>
-#end
-#if ($p1.subPackages)
-<ul>
-#foreach($p2 in $p1.subPackages)
-#package($p2)
-#end
-</ul>
-#end
-#end
-#############################################
-## folllow generalization
-#############################################
-#macro(generals $e)
-#if($e.generalization)
-... #href($e.generalization)
-#generals($e.generalization)
-#end
-#end
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/notifications.vm b/generators/tigerstripe-documentation/templates/notifications.vm
deleted file mode 100644
index ecfcadd..0000000
--- a/generators/tigerstripe-documentation/templates/notifications.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Notifications</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Notifications</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allEvents))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/package.vm b/generators/tigerstripe-documentation/templates/package.vm
deleted file mode 100644
index eb85328..0000000
--- a/generators/tigerstripe-documentation/templates/package.vm
+++ /dev/null
@@ -1,195 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-##set ($hash=${docUtils.getHash($package.fullyQualifiedName)})
-##Now collect all the classes and associations in the package
-#set ($assocs = [])
-#set ($classes = [])
-#set ($intf = [])
-#set($dep = [])
-#set($dat = [])
-#set($exc = [])
-#set($enu = [])
-#set($que = [])
-#set($upd = [])
-#set($not = [])
-#set ($all = [] )
-#foreach($el in $package.getOwnedElements($allArtifacts))
-#if ( $el.association)
-#set ( $t = $assocs.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.managedEntity)
-#set ($t = $classes.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.Interface)
-#set ($t = $intf.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.dependency)
-#set ($t = $dep.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.dataType)
-#set ($t = $dat.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.exception)
-#set ($t = $exc.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.enumeration)
-#set ($t = $enu.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.query)
-#set ($t = $que.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.update)
-#set ($t = $upd.add($el))
-#set ( $t = $all.add($el))
-#end
-#if($el.notification)
-#set ($t = $not.add($el))
-#set ( $t = $all.add($el))
-#end
-#end
-#if(!$all.empty)
-##set ( $generatedFile = "webdocs/pack${hash}.html")
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Package : $package.fullyQualifiedName</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Package: $package.fullyQualifiedName</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#if(!$package.subPackages.empty)
-<h2> Contained Packages</h2>
-<ul>
-#foreach($pack in $package.subPackages)
-<li>#phref($pack)</li>
-#end
-</ul>
-#end
-## And construct the summary
-## classes
-#if ($classes.size()>0)
-<h2>Classes</h2>
-<ul>
-#foreach($el in $classes )
-<li>#lhref($el)</li>
-#if (!$el.navigableConnectingEnds.empty)
-<ul>
-#foreach($e in $el.navigableConnectingEnds)
-<li>$e.name links to #href($e.type) by #href($e.association)</li>
-#end
-</ul>
-#end
-#end
-</ul>
-#end
-## associations
-#if ($assocs.size()>0)
-<h2>Associations</h2>
-<ul>
-#foreach($el in $assocs )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Interfaces
-#if ($intf.size()>0)
-<h2>Interfaces</h2>
-<ul>
-#foreach($el in $intf )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Dependencies
-#if ($dep.size()>0)
-<h2>Dependencies</h2>
-<ul>
-#foreach($el in $dep )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## dataType
-#if ($dat.size()>0)
-<h2>Complex Types</h2>
-<ul>
-#foreach($el in $dat )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Exceptions
-#if ($exc.size()>0)
-<h2>Exceptions</h2>
-<ul>
-#foreach($el in $exc )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Enumerations
-#if ($enu.size()>0)
-<h2>Enumerations</h2>
-<ul>
-#foreach($el in $enu )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Queries
-#if ($que.size()>0)
-<h2>Queries</h2>
-<ul>
-#foreach($el in $que )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Update Procedures
-#if ($upd.size()>0)
-<h2>Update procedures</h2>
-<ul>
-#foreach($el in $upd )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## Notifications
-#if ($not.size()>0)
-<h2>Notifications</h2>
-<ul>
-#foreach($el in $not )
-<li>#lhref($el)</li>
-#end
-</ul>
-#end
-## details
-#if ($all.size()>0)
-<h2>Details</h3>
-#foreach($el in ${docUtils.sortByName($all)} )
-<p/>
-<table cellspacing="8" border="1" width="100%">
-#artiDetails($el)
-#end
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
-		#end
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/queries.vm b/generators/tigerstripe-documentation/templates/queries.vm
deleted file mode 100644
index afbc066..0000000
--- a/generators/tigerstripe-documentation/templates/queries.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Queries</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Queries</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allQueries))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/report.vm b/generators/tigerstripe-documentation/templates/report.vm
deleted file mode 100644
index cf90257..0000000
--- a/generators/tigerstripe-documentation/templates/report.vm
+++ /dev/null
@@ -1,351 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-#####################################
-## construct a hyperlink for a package
-#####################################
-#macro(phref $p)
-#set ($do = false )
-#foreach($el in $p.ownedElements)
-#if ($el.association)
-#set ( $do = true)
-#end
-is it managedent $el.ManagedEntity
-#if($el.ManagedEntity)
-#set ( $do = true)
-#end
-#if($el.Interface)
-#set ( $do = true)
-#end
-#end
-#if ($do)
-#set ($hash=${docUtils.getHash($p.fullyQualifiedName)})
-<a href="pack${hash}.html">$p.name</a>
-#else
-$p.name
-#end
-#end
-#####################################
-## construct a hyperlink for an el
-#####################################
-#macro(href $el)
-#set($bm="$el.name")
-#if ($el.Method || $el.Field )
-#set($bm="${el.owner.name}_${el.name}")
-#end
-#set ($hash="${docUtils.getHash($el.package)}")
-#set ($pf = "pack${hash}.html")
-<a href="$pf#${bm}">
-#if($el.abstract)
-<i>$el.name</i>
-#else
-$el.name
-#end
-</a>
-#end
-#####################################
-## construct a local hyperlink for an el
-#####################################
-#macro(lhref $el)
-<a href="#${el.name}">
-#if($el.abstract)
-<i>$el.name</i>
-#else
-$el.name
-#end
-</a>
-#end
-#####################################
-## construct a bookmark for an el
-#####################################
-#macro(bookmark $el)
-<a name="${el.name}">
-#if($el.abstract)
-<i>$el.name</i>
-#else
-$el.name
-#end
-</a>
-#end
-#####################################
-## construct a bookmark for an op or an attr
-#####################################
-#macro(opAttrBookmark $op)
-<a name="${op.owner.name}_${op.name}">$op.name</a>
-#end
-#####################################
-## construct a bookmark for a blocking op 
-#####################################
-#macro(opBlockingBookmark $op)
-#set ($opName = $stringUtils.capitalize(${op.name}))
-<a name="${op.owner.name}_blocking${opName}">blocking${opName}</a>
-#end
-#####################################
-## dump stereotypes for element
-#####################################
-#macro (stereos $el)
-#foreach ( $s in $el.stereotypeInstances )
-$s.name
-#foreach ($at in $s.CharacterizingStereotype.Attributes)
-#if($at.Array)
-#set ($ts=$el.findTaggedValues($s.name))
-#if (!$ts.empty)
-:
-#set($comma="")
-#foreach($t in $ts)
-$comma $t
-#set ($comma=",")
-#end
-#end
-#else
-#set ($ts=$el.findTaggedValue($s.name))
-#if ($ts.length == 0)##
-#else
-: $ts
-#end
-#end
-#end
-<br/>
-#end
-#end
-#####################################
-## docs for an element
-#####################################
-#macro (docs $el)
-#if(!${stringUtils.isEmpty($el.getDocumentation("",64,false))})
-#set ($doc = $stringEscapeUtils.escapeXml($el.getDocumentation("",64,false)))
-<i>		$doc		</i>
-#end
-#end
-#####################################
-## spit out a type
-#####################################
-#macro (spitType $el)
-#set ($tp1 = $el.Type)
-#if(${tp1.isArtifact()})
-#if ($tp1.enum)
-<a href="enumerations.html#${tp1.name}">
-$tp1.name	</a>
-#elseif($tp1.Datatype)
-<a href="cTypes.html#${tp1.name}">
-$tp1.name	#if($el.isMany())	#end
-</a>
-#elseif($tp1.isEntityType())
-#set($e1= $tp1.getArtifact())
-#href($e1)
-#else
-	$tp1.name	#if($el.isMany())		#end
-	#end
-#else
-$tp1.name	#if($el.isMany())		#end
-#end
-#end
-#####################################
-## handle an operation return
-#####################################
-#macro (returnType $op)
-#set ($tp1 = $op.returnType)
-#if ($tp1.enumeration)
-<a href="enumerations.html#${tp1.name}">
-$tp1.name	#if($op.returnIsMany())	[]	#end
-</a>
-#elseif($tp1.Datatype)
-<a href="cTypes.html#${tp1.name}">
-$tp1.name	#if($op.returnIsMany())	[]	#end
-</a>
-#else
-	$tp1.name	#if($op.returnIsMany())	[]	#end
-#end
-#end
-#####################################
-## handle artifact details
-#####################################
-#macro (artiDetails $ct)
-<table cellspacing="8" border="1" width="100%">
-<tr class="ct">
-<td>
-<b>
-#bookmark($ct)
-</b>
-<br/>
-Type: $ct.artifactType
-<br/>
-Package: $ct.package
-#if ($ct.generalization)
-<br/>
-Superclass: #if($ct.generalization.project)#href($ct.generalization)#else$ct.generalization.fullyQualifiedName#end
-#end
-#if (!$ct.realizations.empty)
-<br/>
-Specializations:
-#set ($comma = "")
-#foreach ($c in $ct.realizations)
- $comma #href($c)
-#set ($comma = ",")
-#end
-#end
-#if($ct.query)
-#if($ct.returnedType)
-<br/>
-Return Type: $ct.returnedType
-#end
-#end
-</td>
-<td width="20%">#stereos($ct)</td>
-</tr>
-<tr>
-<td colspan="2">
-#docs($ct)
-</td>
-</tr>
-	
-	#if($ct.association)
-	#foreach($end in $ct.AssociationEnds)
-	<tr>
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	<b>Name: $end.Name</b>
-	Type: $end.Type.FullyQualifiedName, Visible: $end.VisibilityStr, Multiplicity: $end.DocMultiplicity, Aggregation: $end.EAggregation, Changeable: $end.changeable, Navigable: $end.Navigable, #if($end.many)Ordered: $end.ordered, Unique: $end.unique#end
-	<br/>
-	#docs($end)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($end)
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-	#end
-	
-	#if($ct.dependency)
-	<tr>
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	AEnd Artifact: $ct.AEndType
-	<br/>
-	ZEnd Artifact: $ct.ZEndType
-	<br/>
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-
-#if(!$ct.getAttributes(true).empty)
-		<tr>
-		<td bgcolor="Silver" colspan="2"><b>Attributes</b> (Local attributes on 
-		lavender background) </td>
-	</tr>
-	#foreach($att in $ct.getAttributes(true))
-	#if($att.owner.equals($ct))
-	<tr class="local">
-	#else
-	<tr class="nlocal">
-	#end
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	<b>$att.name:</b>
-	#spitType($att), $att.visibilityStr, Multiplicity: $att.multiplicity#if($att.isMany())#if($att.unique), unique#end#if($att.ordered), ordered#end	#end#if($att.readOnly), readOnly#end#if($att.DefaultValuePresent), Default value: $att.defaultValue#end
-	<br/>
-	#docs($att)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($att)
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-	#end
-	#if(!$ct.getLiterals(true).empty)
-		<tr>
-		<td bgcolor="Silver" colspan="2"><b>Literals</b> (Local literals on 
-		lavender background) </td>
-	</tr>
-	#foreach($lit in $ct.getLiterals(true))
-	#if($lit.owner.equals($ct))
-	<tr class="local">
-	#else
-	<tr class="nlocal">
-	#end
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	<b>$lit.name:</b>
-	$lit.visibilityStr, $lit.IextType.fullyQualifiedName, $docUtils.encode($lit.Value)
-	<br/>
-	#docs($lit)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($lit)
-	</td>
-		</tr>	</table>
-	</td>
-	</tr>
-	#end
-	#end
-	#if(!$ct.getOperations(true).empty)
-		<tr>
-		<td bgcolor="Silver" colspan="2"><b>Methods</b> (Local methods on 
-		lavender background) </td>
-	</tr>
-	#foreach($op in $ct.getOperations(true))
-	#if($op.owner.equals($ct))
-	<tr class="local">
-	#else
-	<tr class="nlocal">
-	#end
-	<td colspan="2">
-	<table width="100%">	<tr>
-	<td>
-	#if($op.abstract)<i>#end<b><a name="${ct.name}_${op.name}">$op.name:</a></b>
-	$op.visibilityStr $op.signature::#if($op.void)void#else$op.returnType.fullyQualifiedName $op.returnMultiplicity #if($op.returnMultiMany)#if($op.Unique) unique#end#if($op.Ordered) ordered#end#end#if($op.returnName.length() > 0) returnName: $op.returnName#end#if($op.defaultReturnValue.length() > 0) defaultReturnValue: $docUtils.encode($op.defaultReturnValue)#end#end
-	#if($op.abstract)</i>#end
-	<br/>
-	#docs($op)
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($op)
-	</td></tr>
-	#if(!$op.arguments.empty)
-	<tr><td>
-	<b>Arguments</b></td>
-	</tr>
-	#foreach($arg in $op.parameters)
-	<tr><td>
-	<b>$arg.name</b>: $arg.type.name $arg.multiplicity#if($arg.many)#if($arg.ordered) ordered#end#if($arg.unique) unique#end#end $docUtils.encode($arg.defaultValue)
-	<br/>
-	#if($arg.comment.length() == 0)##
-	#else
-	<b>Description:</b> #docs($arg)
-	#end
-	</td>
-	<td width="20%" valign="top" >
-	#stereos($arg)
-	#end
-	</td></tr>
-	#end
-	#if($op.exceptionsPresent)
-	</br>
-	<tr><td>
-	<b>Exceptions:</b> $op.exceptionList
-	</td></tr>
-	#end
-		</table>
-	</td>
-	</tr>
-	#end
-	#end
-</table>
-<p/>
-#end
-		
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/templates/updates.vm b/generators/tigerstripe-documentation/templates/updates.vm
deleted file mode 100644
index 49b1f8a..0000000
--- a/generators/tigerstripe-documentation/templates/updates.vm
+++ /dev/null
@@ -1,26 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<html>
-<head>
-<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Update Procedures</title>
-<link rel="stylesheet" type="text/css" href="../css/styles.css">
-</head>
-<body>
-<h1>Update Procedures</h1>
-<p class="small">
-<a href="index.html">back to index</a>
-</p>
-#foreach($ct in ${docUtils.sortByName($castUtils.toModel($allUpdateProcedures))} )
-#artiDetails($ct)
-#end
-<div id="footer-copyright">&copy; $tsProjectHandle.getProjectDetails().getProperty("copyrightNotice","")</div>
-</body>
-</html>
diff --git a/generators/tigerstripe-documentation/templates/xref.vm b/generators/tigerstripe-documentation/templates/xref.vm
deleted file mode 100644
index 709cd62..0000000
--- a/generators/tigerstripe-documentation/templates/xref.vm
+++ /dev/null
@@ -1,36 +0,0 @@
-## Copyright (c) 2008 Cisco Systems, Inc. 
-## All rights reserved. This program and the accompanying materials 
-## are made available under the terms of the Eclipse Public License v1.0 
-## which accompanies this distribution, and is available at
-## http://www.eclipse.org/legal/epl-v10.html 
-## 
-## Contributors: 
-## Cisco Systems, Inc. - dkeysell
-$castUtils.setPluginRef($pluginConfig)##
-<elementXref>
-#foreach( $el in $castUtils.toModel($allArtifacts))
-#set ($hash=${docUtils.getHash($el.package)})
-#set ($url= "pack${hash}.html#${el.name}")
-#if($el.ManagedEntity)
-#set($type="entity")
-#elseif($el.DataType)
-#set($type="complextype")
-#elseif($el.AssociationClass)
-#set($type="associationclass")
-#elseif($el.Association)
-#set($type="association")
-#elseif($el.Enumeration)
-#set($type="enumeration")
-#elseif($el.Interface)
-#set($type="interface")
-#else
-#set($type="error - type not known")
-#end
-<xref>
-  <type>$type</type>
-  <name>$el.name</name>
-  <fqn>$el.fullyQualifiedName</fqn>
-  <url>$url</url>
-</xref>
-#end
-</elementXref>
\ No newline at end of file
diff --git a/generators/tigerstripe-documentation/ts-plugin.xml b/generators/tigerstripe-documentation/ts-plugin.xml
deleted file mode 100644
index 228592c..0000000
--- a/generators/tigerstripe-documentation/ts-plugin.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<ts_plugin version="1.2">
-<project name="tigerstripe-documentation">
-<outputDirectory>target/tigerstripe.gen</outputDirectory>
-<version>3.3</version>
-<description>3.3 Second go at Bugzilla 239395&#13;
-3.2 Bugzilla 239395&#13;
-3.1 First open source version.&#13;
-3.0.2 Entity Services xml parsing&#13;
-3.0.1 Exception thrown on invalid directories (TSPLUG-40)&#13;
-3.0.1 Updated cisco-commons&#13;
-3.0  First Open source compatible version</description>
-<provider>Cisco Systems</provider>
-</project>
-<pluginNature type="Generic"/>
-<logger defautLevel="3" isEnabled="true" logPath="ts-documentation.log" maxRoll="9"/>
-<globalProperties>
-<property name="outputDir" tipToolText="" type="org.eclipse.tigerstripe.workbench.plugins.IStringPluginProperty">tigerstripe-documentation</property>
-</globalProperties>
-<globalRules>
-<rule description="Creates the documentation index page." enabled="true" name="index" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/index.html" overwriteFiles="true" suppressFiles="true" template="templates/index.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="Creates a page documenting the models enumerationas and their literals." enabled="true" name="enumerations" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/enumerations.html" overwriteFiles="true" suppressFiles="true" template="templates/enumerations.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="complexTypes" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/cTypes.html" overwriteFiles="true" suppressFiles="true" template="templates/cTypes.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="xRef" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/xref.xml" overwriteFiles="true" suppressFiles="true" template="templates/xref.vm"/>
-</rule>
-<rule description="" enabled="true" name="copyStyles" type="org.eclipse.tigerstripe.workbench.plugins.ICopyRule">
-<body copyFrom="0" filesetMatch="resources\styles.css" toDirectory="${ppProp.outputDir}/css"/>
-</rule>
-<rule description="" enabled="true" name="notifications" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/notifications.html" overwriteFiles="true" suppressFiles="true" template="templates/notifications.vm">
-<library name="templates\index.vm"/>
-<library name="templates\report.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="exceptions" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/exceptions.html" overwriteFiles="true" suppressFiles="true" template="templates\exceptions.vm">
-<library name="templates\report.vm"/>
-<library name="templates\indexMacros.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="updates" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/updates.html" overwriteFiles="true" suppressFiles="true" template="templates\updates.vm">
-<library name="templates\indexMacros.vm"/>
-<library name="templates\report.vm"/>
-</body>
-</rule>
-<rule description="" enabled="true" name="queries" type="org.eclipse.tigerstripe.workbench.plugins.IGlobalTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.CastUtils" entry="castUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<body outputFile="${ppProp.outputDir}/webdocs/queries.html" overwriteFiles="true" suppressFiles="true" template="templates\queries.vm">
-<library name="templates\indexMacros.vm"/>
-<library name="templates\report.vm"/>
-</body>
-</rule>
-</globalRules>
-<artifactRules>
-<rule description="" enabled="true" name="package" type="org.eclipse.tigerstripe.workbench.plugins.IArtifactBasedTemplateRule">
-<contextEntry classname="org.eclipse.tigerstripe.generators.utils.DocUtils" entry="docUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringUtils" entry="stringUtils"/>
-<contextEntry classname="org.apache.commons.lang.StringEscapeUtils" entry="stringEscapeUtils"/>
-<body artifactFilterClass="" artifactType="Any Artifact" includeDependencies="true" modelClass="org.eclipse.tigerstripe.generators.models.PackageModel" modelClassName="package" outputFile="${ppProp.outputDir}/webdocs/pack${package.Hash}.html" overwriteFiles="false" suppressFiles="true" template="templates/package.vm">
-<library name="templates\report.vm"/>
-</body>
-</rule>
-</artifactRules>
-<classpathEntries>
-<entry relativePath="commons-lang-2.1.zip"/>
-</classpathEntries>
-<additionalFiles>
-<includeEntry relativePath="resources/"/>
-</additionalFiles>
-<advanced/>
-</ts_plugin>
diff --git a/misc/moduleGeneration-maven-plugin/.classpath b/misc/moduleGeneration-maven-plugin/.classpath
deleted file mode 100644
index a162450..0000000
--- a/misc/moduleGeneration-maven-plugin/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
-	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
-	<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.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
-	<classpathentry kind="output" path="target/classes"/>
-</classpath>
diff --git a/misc/moduleGeneration-maven-plugin/.project b/misc/moduleGeneration-maven-plugin/.project
deleted file mode 100644
index 1b516e4..0000000
--- a/misc/moduleGeneration-maven-plugin/.project
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>moduleGeneration-maven-plugin</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.maven.ide.eclipse.maven2Builder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.maven.ide.eclipse.maven2Nature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/misc/moduleGeneration-maven-plugin/.settings/org.eclipse.jdt.core.prefs b/misc/moduleGeneration-maven-plugin/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 00b2583..0000000
--- a/misc/moduleGeneration-maven-plugin/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,13 +0,0 @@
-#Fri Apr 09 16:42:02 NOVST 2010
-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.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/misc/moduleGeneration-maven-plugin/.settings/org.maven.ide.eclipse.prefs b/misc/moduleGeneration-maven-plugin/.settings/org.maven.ide.eclipse.prefs
deleted file mode 100644
index b65f35f..0000000
--- a/misc/moduleGeneration-maven-plugin/.settings/org.maven.ide.eclipse.prefs
+++ /dev/null
@@ -1,9 +0,0 @@
-#Fri Apr 09 16:41:03 NOVST 2010
-activeProfiles=
-eclipse.preferences.version=1
-fullBuildGoals=process-test-resources
-includeModules=false
-resolveWorkspaceProjects=true
-resourceFilterGoals=process-resources resources\:testResources
-skipCompilerPlugin=true
-version=1
diff --git a/misc/moduleGeneration-maven-plugin/pom.xml b/misc/moduleGeneration-maven-plugin/pom.xml
deleted file mode 100644
index a93d7e3..0000000
--- a/misc/moduleGeneration-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>moduleGeneration-maven-plugin</artifactId>
-	<packaging>maven-plugin</packaging>
-	<version>1.0</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/moduleGeneration-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/ModuleGenerationMojo.java b/misc/moduleGeneration-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/ModuleGenerationMojo.java
deleted file mode 100644
index 24bace1..0000000
--- a/misc/moduleGeneration-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/ModuleGenerationMojo.java
+++ /dev/null
@@ -1,132 +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 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
- */
-public class ModuleGenerationMojo extends AbstractMojo {
-
-	private static final String DELIMITER = "=";
-
-	private static final String MODULE_PROJECT_ARG = "MODULE_PROJECT";
-
-	private static final String MODULE_OUTPUT_ARG = "MODULE_OUTPUT";
-
-	private static final String INCLUDE_DIAGRAMS_ARG = "INCLUDE_DIAGRAMS";
-
-	private static final String INCLUDE_ANNONATIONS_ARG = "INCLUDE_ANNONATIONS";
-
-	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="${eclipseHome}"
-	 * @required
-	 */
-	public String eclipseHome;
-
-	/**
-	 * @parameter expression="${workspace}"
-	 * @required
-	 */
-	public String workspace;
-
-	/**
-	 * @parameter expression="${moduleProject}"
-	 * @required
-	 */
-	public String moduleProject;
-
-	/**
-	 * @parameter expression="${moduleOutput}"
-	 * @required
-	 */
-	public String moduleOutput;
-
-	/**
-	 * @parameter expression="${includeDiagrams}"
-	 * @required
-	 */
-	public String includeDiagrams;
-
-	/**
-	 * @parameter expression="${includeAnnotations}"
-	 * @required
-	 */
-	public String includeAnnotations;
-
-	public void execute() throws MojoExecutionException {
-
-		getLog().debug("Workspace: " + workspace);
-		getLog().info("Exported project: " + moduleProject);
-		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.moduleGeneration");
-
-		cl.createArg().setValue(MODULE_PROJECT_ARG + DELIMITER + moduleProject);
-		cl.createArg().setValue(MODULE_OUTPUT_ARG + DELIMITER + moduleOutput);
-		cl.createArg().setValue(
-				INCLUDE_DIAGRAMS_ARG + DELIMITER + includeDiagrams);
-		cl.createArg().setValue(
-				INCLUDE_ANNONATIONS_ARG + DELIMITER + includeAnnotations);
-
-		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/moduleGeneration-maven-plugin/src/test/java/org/eclipse/tigerstripe/mojo/ModuleGenerationMojoTest.java b/misc/moduleGeneration-maven-plugin/src/test/java/org/eclipse/tigerstripe/mojo/ModuleGenerationMojoTest.java
deleted file mode 100644
index fd7956b..0000000
--- a/misc/moduleGeneration-maven-plugin/src/test/java/org/eclipse/tigerstripe/mojo/ModuleGenerationMojoTest.java
+++ /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
- *******************************************************************************/
-
-package org.eclipse.tigerstripe.mojo;
-
-import junit.framework.TestCase;
-
-public class ModuleGenerationMojoTest extends TestCase {
-
-	public void testGetExecutableForOs() {
-
-		ModuleGenerationMojo mojo = new ModuleGenerationMojo();
-
-		try {
-			mojo.getExecutableForOs("unsupported os");
-			fail("Expected UnsupportedOperationException");
-		} catch (UnsupportedOperationException uoe) {
-			// pass
-		}
-
-		assertEquals(ModuleGenerationMojo.MAC_ECLIPSE_EXE, mojo
-				.getExecutableForOs("Mac OS"));
-		assertEquals(ModuleGenerationMojo.WIN_ECLIPSE_EXE, mojo
-				.getExecutableForOs("Windows XP"));
-		assertEquals(ModuleGenerationMojo.WIN_ECLIPSE_EXE, mojo
-				.getExecutableForOs("Windows 2003"));
-		assertEquals(ModuleGenerationMojo.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(ModuleGenerationMojo.MAC_ECLIPSE_EXE, mojo
-					.getExecutableForOs(System.getProperty("os.name")));
-		} else if (System.getProperty("os.name").startsWith("Windows")) {
-			assertEquals(ModuleGenerationMojo.WIN_ECLIPSE_EXE, mojo
-					.getExecutableForOs(System.getProperty("os.name")));
-		}
-
-	}
-
-}
diff --git a/misc/moduleGeneration-maven-plugin/target/classes/META-INF/maven/plugin.xml b/misc/moduleGeneration-maven-plugin/target/classes/META-INF/maven/plugin.xml
deleted file mode 100644
index 717693c..0000000
--- a/misc/moduleGeneration-maven-plugin/target/classes/META-INF/maven/plugin.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<plugin>
-  <name>Tigerstripe Maven Plug-in</name>
-  <description></description>
-  <groupId>tigerstripe</groupId>
-  <artifactId>moduleGeneration-maven-plugin</artifactId>
-  <version>1.0</version>
-  <goalPrefix>moduleGeneration</goalPrefix>
-  <isolatedRealm>false</isolatedRealm>
-  <inheritedByDefault>true</inheritedByDefault>
-  <mojos>
-    <mojo>
-      <goal>generate</goal>
-      <description></description>
-      <requiresDirectInvocation>false</requiresDirectInvocation>
-      <requiresProject>true</requiresProject>
-      <requiresReports>false</requiresReports>
-      <aggregator>false</aggregator>
-      <requiresOnline>false</requiresOnline>
-      <inheritedByDefault>true</inheritedByDefault>
-      <implementation>org.eclipse.tigerstripe.mojo.ModuleGenerationMojo</implementation>
-      <language>java</language>
-      <instantiationStrategy>per-lookup</instantiationStrategy>
-      <executionStrategy>once-per-session</executionStrategy>
-      <parameters>
-        <parameter>
-          <name>eclipseHome</name>
-          <type>java.lang.String</type>
-          <required>true</required>
-          <editable>true</editable>
-          <description></description>
-        </parameter>
-        <parameter>
-          <name>includeAnnotations</name>
-          <type>java.lang.String</type>
-          <required>true</required>
-          <editable>true</editable>
-          <description></description>
-        </parameter>
-        <parameter>
-          <name>includeDiagrams</name>
-          <type>java.lang.String</type>
-          <required>true</required>
-          <editable>true</editable>
-          <description></description>
-        </parameter>
-        <parameter>
-          <name>moduleOutput</name>
-          <type>java.lang.String</type>
-          <required>true</required>
-          <editable>true</editable>
-          <description></description>
-        </parameter>
-        <parameter>
-          <name>moduleProject</name>
-          <type>java.lang.String</type>
-          <required>true</required>
-          <editable>true</editable>
-          <description></description>
-        </parameter>
-        <parameter>
-          <name>workspace</name>
-          <type>java.lang.String</type>
-          <required>true</required>
-          <editable>true</editable>
-          <description></description>
-        </parameter>
-      </parameters>
-      <configuration>
-        <eclipseHome implementation="java.lang.String">${eclipseHome}</eclipseHome>
-        <includeAnnotations implementation="java.lang.String">${includeAnnotations}</includeAnnotations>
-        <includeDiagrams implementation="java.lang.String">${includeDiagrams}</includeDiagrams>
-        <moduleOutput implementation="java.lang.String">${moduleOutput}</moduleOutput>
-        <moduleProject implementation="java.lang.String">${moduleProject}</moduleProject>
-        <workspace implementation="java.lang.String">${workspace}</workspace>
-      </configuration>
-    </mojo>
-  </mojos>
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.maven</groupId>
-      <artifactId>maven-plugin-api</artifactId>
-      <type>jar</type>
-      <version>2.0</version>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.plexus</groupId>
-      <artifactId>plexus-utils</artifactId>
-      <type>jar</type>
-      <version>1.4.9</version>
-    </dependency>
-  </dependencies>
-</plugin>
\ No newline at end of file
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/patch_version.sh b/patch_version.sh
deleted file mode 100644
index 2cda3a5..0000000
--- a/patch_version.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-
-if [ $# -ne 3 ]; then
-    echo "usage: patch-versions.sh source-codebase destination version-string"
-    exit 1
-fi
-
-XML=/usr/cisco/bin/xml
-
-# set -x
-
-SRC=$1; shift
-DST=$1; shift
-VERSION_STRING=$1.qualifier; shift
-
-
-DST=$(mkdir -p $DST; cd $DST; pwd)
-
-( cd $SRC
-  find . -maxdepth 6 -type f -name MANIFEST.MF -o -name feature.xml| while read ofn; do
-      if ! echo $ofn | grep -q '/target/' >/dev/null ; then
-          nfn=$DST/$ofn
-
-          case $ofn in
-          */MANIFEST.MF) 
-              if egrep 'Bundle-Version:[[:blank:]]*0\.0\.0' >/dev/null $ofn; then
-                  mkdir -p `dirname "$nfn"`
-                  echo "[versioning $nfn]"
-                  sed -e "s/Bundle-Version:\\s*0\.0\.0\\s*$/Bundle-Version: $VERSION_STRING/g" "$ofn" > "$nfn"
-              fi
-              ;;
-          */feature.xml) 
-              if [ x`$XML sel -t -v '/feature/@version' $ofn` == "x0.0.0" ]; then
-                  mkdir -p `dirname "$nfn"`
-                  echo "[versioning $nfn]"
-                  $XML ed -u '/feature/@version' -v "$VERSION_STRING" "$ofn" >"$nfn"
-              fi
-              ;;
-          esac
-      fi
-  done
-)
\ No newline at end of file
diff --git a/plugins/org.eclipse.tigerstripe.annotation.core.test/.classpath b/plugins/org.eclipse.tigerstripe.annotation.core.test/.classpath
deleted file mode 100644
index 64c5e31..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.core.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.core.test/.project b/plugins/org.eclipse.tigerstripe.annotation.core.test/.project
deleted file mode 100644
index e86acda..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.core.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotation.core.test</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.tigerstripe.annotation.core.test/.settings/org.eclipse.jdt.core.prefs b/plugins/org.eclipse.tigerstripe.annotation.core.test/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index f25c816..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.core.test/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Wed Jul 09 11:23:48 PDT 2008
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/plugins/org.eclipse.tigerstripe.annotation.core.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotation.core.test/META-INF/MANIFEST.MF
deleted file mode 100644
index e15a103..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.core.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,36 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotation.core.test; singleton:=true
-Bundle-Version: 0.0.0
-Bundle-ClassPath: .
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: org.eclipse.tigerstripe.annotation.core.test.model,
- org.eclipse.tigerstripe.annotation.core.test.model.impl,
- org.eclipse.tigerstripe.annotation.core.test.model.util
-Require-Bundle: org.eclipse.core.runtime,
- org.junit,
- org.eclipse.jface,
- org.eclipse.jdt.core,
- org.eclipse.tigerstripe.annotation.core,
- org.eclipse.emf.ecore.change,
- org.eclipse.ui.workbench,
- org.eclipse.tigerstripe.espace.core,
- org.eclipse.emf.validation,
- org.eclipse.tigerstripe.espace.resources,
- org.eclipse.tigerstripe.annotation.java,
- org.eclipse.tigerstripe.annotation.java.ui,
- org.eclipse.tigerstripe.annotation.java.ui.refactoring,
- org.eclipse.tigerstripe.annotation.example,
- org.eclipse.tigerstripe.annotation.example.person,
- org.eclipse.tigerstripe.annotation.example.person.validators,
- org.eclipse.tigerstripe.annotation.example.router,
- org.eclipse.tigerstripe.annotation.resource,
- org.eclipse.tigerstripe.annotation.resource.ui,
- org.eclipse.tigerstripe.annotation.ui,
- org.eclipse.tigerstripe.annotation.validation,
- org.eclipse.tigerstripe.espace.resources.monitor
-Bundle-ActivationPolicy: lazy
-Bundle-Activator: org.eclipse.tigerstripe.annotation.core.test.Activator
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.tigerstripe.annotation.core.test/about.html b/plugins/org.eclipse.tigerstripe.annotation.core.test/about.html
deleted file mode 100644
index 2947908..0000000
--- a/plugins/org.eclipse.tigerstripe.annotation.core.test/about.html
+++ /dev/null
@@ -1,28 +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>
-<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1"/>
-<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 Redistr