This commit was manufactured by cvs2svn to create tag 'v200804211632'.
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 84cf174..0000000
--- a/features/org.eclipse.tigerstripe.base.test-feature/feature.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.base.test_feature"
-      label="Test_feature Feature"
-      version="0.3.0.qualifier">
-
-   <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"/>
-
-</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 64f93a9..0000000
--- a/features/org.eclipse.tigerstripe.base/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/features/org.eclipse.tigerstripe.base/feature.xml b/features/org.eclipse.tigerstripe.base/feature.xml
deleted file mode 100644
index 3ea278e..0000000
--- a/features/org.eclipse.tigerstripe.base/feature.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.base"
-      label="Tigerstripe Base Feature (Incubation)"
-      version="0.3.0.qualifier">
-
-   <description url="http://www.example.com/description">
-      [Enter Feature Description here.]
-   </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>
-
-   <url>
-      <update label="Tigerstripe Update Site (Incubation)" url="http://www.eclipse.org/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.annotations"
-         download-size="0"
-         install-size="0"
-         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"/>
-
-</feature>
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/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 b1970fa..0000000
--- a/features/org.eclipse.tigerstripe.workbench/feature.xml
+++ /dev/null
@@ -1,202 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="org.eclipse.tigerstripe.workbench"
-      label="%featureName"
-      version="0.3.0.qualifier"
-      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="%TigerstripeUpdateSiteName" url="http://download.eclipse.org/technology/tigerstripe/updates/"/>
-      <discovery label="%TigerstripeUpdateSiteName" url="http://download.eclipse.org/technology/tigerstripe/updates/"/>
-   </url>
-
-   <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.uml2"/>
-      <import plugin="org.eclipse.uml2.uml"/>
-      <import plugin="org.eclipse.uml2.uml.resources"/>
-      <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.emf.common"/>
-      <import plugin="org.eclipse.emf.query.ocl"/>
-      <import plugin="org.eclipse.emf.ocl"/>
-      <import plugin="org.eclipse.gmf.runtime.draw2d.ui"/>
-      <import plugin="org.eclipse.draw2d"/>
-      <import plugin="org.eclipse.gmf.runtime.diagram.ui.actions"/>
-      <import plugin="org.eclipse.emf.edit"/>
-      <import plugin="org.eclipse.jdt"/>
-      <import plugin="org.eclipse.emf"/>
-      <import plugin="org.eclipse.emf.ecore.sdo"/>
-   </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.base"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"/>
-
-   <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.help"
-         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.annotations"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.annotations.ui"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="org.eclipse.tigerstripe.metamodel"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/features/org.eclipse.tigerstripe.workbench/license.html b/features/org.eclipse.tigerstripe.workbench/license.html
deleted file mode 100644
index a9b560f..0000000
--- a/features/org.eclipse.tigerstripe.workbench/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/misc/tigerstripe-maven-plugin/.classpath b/misc/tigerstripe-maven-plugin/.classpath
deleted file mode 100644
index 70e714b..0000000
--- a/misc/tigerstripe-maven-plugin/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<classpath>
-  <classpathentry kind="src" path="src/main/java"/>
-  <classpathentry kind="output" path="target/classes"/>
-  <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"/>
-</classpath>
\ No newline at end of file
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 00632b7..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>cisco-tigerstripe</groupId>
-	<artifactId>maven-tigerstripe-plugin</artifactId>
-	<packaging>maven-plugin</packaging>
-	<version>1.1</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 d4254bf..0000000
--- a/misc/tigerstripe-maven-plugin/src/main/java/org/eclipse/tigerstripe/mojo/GenerateMojo.java
+++ /dev/null
@@ -1,89 +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";
-	
-	/**
-	 * @parameter expression="${workspace}"
-	 * @required
-	 */
-	public String workspace;
-	
-	/**
-	 * @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);
-		}
-		
-		Commandline cl = new Commandline();
-		cl.setExecutable(System.getenv("ECLIPSE_HOME") + File.separator + "eclipsec.exe");
-		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);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/.classpath b/plugins/org.eclipse.tigerstripe.annotations.samples/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/.project b/plugins/org.eclipse.tigerstripe.annotations.samples/.project
deleted file mode 100644
index 3af3431..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotations.samples</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.annotations.samples/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotations.samples/META-INF/MANIFEST.MF
deleted file mode 100644
index bc6bb98..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation Samples Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotations.samples;singleton:=true
-Bundle-Version: 1.0.0
-Bundle-Activator: org.eclipse.tigerstripe.annotations.samples.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.ui,
- org.eclipse.tigerstripe.annotations
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/build.properties b/plugins/org.eclipse.tigerstripe.annotations.samples/build.properties
deleted file mode 100644
index 686c5f5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               src/org/
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/plugin.xml b/plugins/org.eclipse.tigerstripe.annotations.samples/plugin.xml
deleted file mode 100644
index 265dd54..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/plugin.xml
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.tigerstripe.annotations.scheme">
-      <scheme
-            ID="org.eclipse.tigerstripe.annotations.samples.scheme.default"
-            selector="org.eclipse.tigerstripe.annotations.samples.defaults.DefaultSchemeSelector"
-            userLabel="Default">
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.samples.forms.all"
-               selector="org.eclipse.tigerstripe.annotations.samples.defaults.DefaultFormSelector">
-         </annotationForm>
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.samples.forms.entity"
-               selector="org.eclipse.tigerstripe.annotations.samples.defaults.DefaultEntityFormSelector">
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.version"
-                  defaultValue="1.0"
-                  index="0"
-                  userLabel="Version">
-            </stringAnnotationSpecification>
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.devowner"
-                  index="2"
-                  userLabel="Development Owner">
-            </stringAnnotationSpecification>
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.description"
-                  index="1"
-                  userLabel="Description">
-            </stringAnnotationSpecification>
-            <booleanAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.prelim"
-                  defaultValue="false"
-                  index="4"
-                  userLabel="Preliminary">
-            </booleanAnnotationSpecification>
-            <booleanAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.provisional"
-                  defaultValue="false"
-                  index="4"
-                  userLabel="Provisional">
-            </booleanAnnotationSpecification>
-         </annotationForm>
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.samples.forms.project"
-               selector="org.eclipse.tigerstripe.annotations.samples.defaults.DefaultProjectFormSelector">
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.date"
-                  index="0"
-                  userLabel="Creation Date">
-            </stringAnnotationSpecification>
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.creator"
-                  index="1"
-                  userLabel="Project Creator">
-            </stringAnnotationSpecification>
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.description"
-                  index="2"
-                  userLabel="Description">
-            </stringAnnotationSpecification>
-         </annotationForm>
-      </scheme>
-   </extension>
-   <extension
-         point="org.eclipse.tigerstripe.annotations.scheme">
-      <scheme
-            ID="org.eclipse.tigerstripe.annotations.samples.scheme.hibernate"
-            selector="org.eclipse.tigerstripe.annotations.samples.hibernate.HibernateSchemeSelector"
-            userLabel="Hibernate Mappings">
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.samples.forms.entity.hibernate"
-               selector="org.eclipse.tigerstripe.annotations.samples.hibernate.HibernateEntityFormSelector">
-            <enumerationAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.enum.type"
-                  index="0"
-                  userLabel="Type Override">
-               <literal
-                     index="0"
-                     value="">
-			   </literal>
-               <literal
-                     index="1"
-                     value="text">
-               </literal>
-               <literal
-                     index="2"
-                     value="string">
-               </literal>
-               <literal
-                     index="3"
-                     value="serializable">
-               </literal>
-            </enumerationAnnotationSpecification>
-            <enumerationAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.enum.cascade"
-                  index="1"
-                  userLabel="Cascade Override">
-               <literal
-                     index="0"
-                     value="">
-				</literal>
-               <literal
-                     index="1"
-                     value="all">
-               </literal>
-               <literal
-                     index="2"
-                     value="none">
-               </literal>
-               <literal
-                     index="3"
-                     value="save-update">
-               </literal>
-               <literal
-                     index="4"
-                     value="save-update delete">
-               </literal>
-            </enumerationAnnotationSpecification>
-            <enumerationAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.samples.annotations.enum.inheritance"
-                  index="2"
-                  userLabel="Inheritance Override">
-               <literal
-                     index="0"
-                     value="">
-               </literal>
-               <literal
-                     index="1"
-                     value="interface">
-               </literal>
-               <literal
-                     index="2"
-                     value="union-subclass">
-               </literal>
-            </enumerationAnnotationSpecification>
-         </annotationForm>
-      </scheme>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/Activator.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/Activator.java
deleted file mode 100644
index 6685c77..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tigerstripe.annotations.samples";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultEntityFormSelector.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultEntityFormSelector.java
deleted file mode 100644
index ce746b9..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultEntityFormSelector.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples.defaults;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class DefaultEntityFormSelector implements ISelector {
-
-	public DefaultEntityFormSelector() {
-	}
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		return false;
-	}
-
-	public boolean select(String URI) {
-
-		if (URI.startsWith("tigerstripe:")) {
-			return true;
-		}
-		return false;
-	}
-
-	public void setContext(Object context) {
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultFormSelector.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultFormSelector.java
deleted file mode 100644
index d87b020..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultFormSelector.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples.defaults;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class DefaultFormSelector implements ISelector {
-
-	public DefaultFormSelector() {
-	}
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		return false;
-	}
-
-	public boolean select(String URI) {
-		// these have selector defined already (need to discuss this)
-		if(!URI.startsWith("tigerstripe:/")) {
-			return true;
-		}
-		return false;
-	}
-
-	public void setContext(Object context) {
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultProjectFormSelector.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultProjectFormSelector.java
deleted file mode 100644
index d109580..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultProjectFormSelector.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples.defaults;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class DefaultProjectFormSelector implements ISelector {
-
-	public DefaultProjectFormSelector() {
-	}
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		return false;
-	}
-
-	public boolean select(String URI) {
-		if(URI.startsWith("project:/")) {
-			return true;
-		}
-		return false;
-	}
-
-	public void setContext(Object context) {
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultSchemeSelector.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultSchemeSelector.java
deleted file mode 100644
index 2963cfa..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/defaults/DefaultSchemeSelector.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples.defaults;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class DefaultSchemeSelector implements ISelector {
-
-	public DefaultSchemeSelector() {
-	}
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		return false;
-	}
-
-	public boolean select(String URI) {
-		return true;
-	}
-
-	public void setContext(Object context) {
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/hibernate/HibernateEntityFormSelector.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/hibernate/HibernateEntityFormSelector.java
deleted file mode 100644
index 58efcfe..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/hibernate/HibernateEntityFormSelector.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples.hibernate;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class HibernateEntityFormSelector implements ISelector {
-
-	public HibernateEntityFormSelector() {
-	}
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		return false;
-	}
-
-	public boolean select(String URI) {
-		if(URI.endsWith(".java")) {
-			return true;
-		}
-		return false;
-	}
-
-	public void setContext(Object context) {
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/hibernate/HibernateSchemeSelector.java b/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/hibernate/HibernateSchemeSelector.java
deleted file mode 100644
index d4e1936..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.samples/src/org/eclipse/tigerstripe/annotations/samples/hibernate/HibernateSchemeSelector.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package org.eclipse.tigerstripe.annotations.samples.hibernate;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class HibernateSchemeSelector implements ISelector {
-
-	public HibernateSchemeSelector() {
-	}
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		return false;
-	}
-
-	public boolean select(String URI) {
-		if(URI.endsWith(".java")) {
-			return true;
-		}
-		return false;
-	}
-
-	public void setContext(Object context) {
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/.classpath b/plugins/org.eclipse.tigerstripe.annotations.test/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/.project b/plugins/org.eclipse.tigerstripe.annotations.test/.project
deleted file mode 100644
index 2bd8e22..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotations.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.annotations.test/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotations.test/META-INF/MANIFEST.MF
deleted file mode 100644
index 36ac9a3..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,10 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotations Test Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotations.test;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-Activator: org.eclipse.tigerstripe.annotations.test.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.tigerstripe.annotations,
- org.junit
-Eclipse-LazyStart: true
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/build.properties b/plugins/org.eclipse.tigerstripe.annotations.test/build.properties
deleted file mode 100644
index e9863e2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/build.properties
+++ /dev/null
@@ -1,5 +0,0 @@
-source.. = src/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/plugin.xml b/plugins/org.eclipse.tigerstripe.annotations.test/plugin.xml
deleted file mode 100644
index 7168dda..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/plugin.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-
-   <extension
-         point="org.eclipse.tigerstripe.annotations.scheme">
-      <scheme
-            ID="org.eclipse.tigerstripe.annotations.test.scheme1"
-            selector="org.eclipse.tigerstripe.annotations.test.input.SchemeSelector1"
-            userLabel="scheme1">
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.test.scheme1.annotationForm1"
-               selector="org.eclipse.tigerstripe.annotations.test.input.Form1Selector">
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.scheme1.form1.stringAnnotationSpecification1"
-                  index="1"
-                  userLabel="Label1">
-            </stringAnnotationSpecification>
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.scheme1.form1.stringAnnotationSpecification2"
-                  index="10"
-                  userLabel="Field2">
-            </stringAnnotationSpecification>
-         </annotationForm>
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.test.scheme1.annotationForm2"
-               selector="org.eclipse.tigerstripe.annotations.test.input.Form2Selector">
-            <stringAnnotationSpecification
-                  ID="org.eclipse.tigerstripe.annotations.scheme1.form2.stringAnnotationSpecification1"
-                  index="1"
-                  userLabel="FileAnnotation">
-            </stringAnnotationSpecification>
-         </annotationForm>
-         <annotationForm
-               ID="org.eclipse.tigerstripe.annotations.scheme1.emptyForm">
-         </annotationForm>
-      </scheme>
-   </extension>
-   <extension
-         point="org.eclipse.tigerstripe.annotations.scheme">
-      <scheme
-            ID="org.eclipse.tigerstripe.annotations.test.scheme2"
-            userLabel="emptyScheme">
-      </scheme>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/Activator.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/Activator.java
deleted file mode 100644
index 160c1f8..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/Activator.java
+++ /dev/null
@@ -1,50 +0,0 @@
-package org.eclipse.tigerstripe.annotations.test;
-
-import org.eclipse.core.runtime.Plugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tigerstripe.annotations.test";
-
-	// The shared instance
-	private static Activator plugin;
-	
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugins#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * @see org.eclipse.core.runtime.Plugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 *
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/AllTests.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/AllTests.java
deleted file mode 100644
index 80ccbdd..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/AllTests.java
+++ /dev/null
@@ -1,28 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test;
-
-import junit.framework.Test;
-import junit.framework.TestSuite;
-
-public class AllTests {
-
-	public static Test suite() {
-		TestSuite suite = new TestSuite(
-				"Test for org.eclipse.tigerstripe.annotations.test");
-		// $JUnit-BEGIN$
-		suite.addTestSuite(TestRegistry.class);
-		suite.addTestSuite(TestAnnotationScheme.class);
-		// $JUnit-END$
-		return suite;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/TestAnnotationScheme.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/TestAnnotationScheme.java
deleted file mode 100644
index 126516d..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/TestAnnotationScheme.java
+++ /dev/null
@@ -1,74 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationSchemeRegistry;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.test.input.IInputConstants;
-
-import junit.framework.TestCase;
-
-public class TestAnnotationScheme extends TestCase {
-
-	private IAnnotationScheme scheme1 = null;
-	private IAnnotationScheme scheme2 = null;
-
-	protected void setUp() throws Exception {
-		super.setUp();
-
-		scheme1 = AnnotationSchemeRegistry.eINSTANCE
-				.getAnnotationSchemeByID(IInputConstants.SCHEME1_ID);
-		assertNotNull(scheme1);
-		scheme2 = AnnotationSchemeRegistry.eINSTANCE
-				.getAnnotationSchemeByID(IInputConstants.SCHEME2_ID);
-		assertNotNull(scheme2);
-	}
-
-	public void testGetUserLabel() throws AnnotationCoreException {
-		String label = scheme1.getNamespaceUserLabel();
-		assertEquals(IInputConstants.SCHEME1_LABEL, label);
-
-		String label2 = scheme2.getNamespaceUserLabel();
-		assertEquals(IInputConstants.SCHEME2_LABEL, label2);
-	}
-
-	public void testSelectForm() throws AnnotationCoreException {
-		IAnnotationForm form = scheme1.selectForm(IInputConstants.URI1);
-		assertNotNull(form);
-		assertEquals(IInputConstants.FORM1_ID, form.getID());
-
-		form = scheme1.selectForm(IInputConstants.URI2);
-		assertNotNull(form);
-		assertEquals(IInputConstants.FORM2_ID, form.getID());
-
-		form = scheme1.selectForm("dummy");
-		assertNotNull(form);
-		assertEquals(IInputConstants.EMPTYFORM_ID, form.getID());
-
-		form = scheme1.selectForm(null);
-		assertNull(form);
-
-		form = scheme2.selectForm(IInputConstants.URI1);
-		assertNull(form);
-	}
-
-	public void testGetDefinedForms() throws AnnotationCoreException {
-		IAnnotationForm[] defForms = scheme1.getDefinedForms();
-		assertNotNull(defForms);
-		assertEquals(3, defForms.length);
-
-		defForms = scheme2.getDefinedForms();
-		assertNotNull(defForms);
-		assertEquals(0, defForms.length);
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/TestRegistry.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/TestRegistry.java
deleted file mode 100644
index 4fc745e..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/TestRegistry.java
+++ /dev/null
@@ -1,64 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationSchemeRegistry;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.test.input.IInputConstants;
-
-import junit.framework.TestCase;
-
-public class TestRegistry extends TestCase {
-
-	/**
-	 * Test that all defined schemes can be retrieved without the use of
-	 * selector
-	 * 
-	 */
-	public final void testGetAllDefinedSchemes() throws AnnotationCoreException {
-		IAnnotationScheme[] allSchemes = AnnotationSchemeRegistry.eINSTANCE
-				.getDefinedSchemes(null);
-
-		assertNotNull("AnnotationSchemeRegistry shouldn't return null",
-				allSchemes);
-		assertEquals(IInputConstants.NUMBER_OF_SCHEMES, allSchemes.length);
-	}
-
-	public final void testGetDefinedSchemes() throws AnnotationCoreException {
-		// should get 2 for URI1 as scheme1 triggers on it, and scheme2 has the
-		// default selector (always true)
-		IAnnotationScheme[] uri1Schemes = AnnotationSchemeRegistry.eINSTANCE
-				.getDefinedSchemes(IInputConstants.URI1);
-		assertEquals(IInputConstants.NUMBER_OF_SCHEMES, uri1Schemes.length);
-
-		// should only get 1 for URI2
-		IAnnotationScheme[] uri2Schemes = AnnotationSchemeRegistry.eINSTANCE
-				.getDefinedSchemes(IInputConstants.URI2);
-		assertEquals(1, uri2Schemes.length);
-	}
-
-	public final void testGetAnnotationSchemeByID()
-			throws AnnotationCoreException {
-		IAnnotationScheme scheme1 = AnnotationSchemeRegistry.eINSTANCE
-				.getAnnotationSchemeByID(IInputConstants.SCHEME1_ID);
-		assertEquals(IInputConstants.SCHEME1_ID, scheme1.getNamespaceID());
-
-		IAnnotationScheme scheme2 = AnnotationSchemeRegistry.eINSTANCE
-				.getAnnotationSchemeByID(IInputConstants.SCHEME2_ID);
-		assertEquals(IInputConstants.SCHEME2_ID, scheme2.getNamespaceID());
-
-		IAnnotationScheme dummy = AnnotationSchemeRegistry.eINSTANCE
-				.getAnnotationSchemeByID("dummy");
-		assertNull(dummy);
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/Form1Selector.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/Form1Selector.java
deleted file mode 100644
index f33eaa5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/Form1Selector.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. - Initial API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test.input;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class Form1Selector implements ISelector {
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean select(String URI) {
-		return URI.equals(IInputConstants.URI1);
-	}
-
-	public void setContext(Object context) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/Form2Selector.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/Form2Selector.java
deleted file mode 100644
index a446b46..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/Form2Selector.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. - Initial API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test.input;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class Form2Selector implements ISelector {
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean select(String URI) {
-		return URI.equals(IInputConstants.URI2);
-	}
-
-	public void setContext(Object context) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/IInputConstants.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/IInputConstants.java
deleted file mode 100644
index 8e6b6dd..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/IInputConstants.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. - Initial API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test.input;
-
-/**
- * A convenience interface defining a bunch of constants used throughout the
- * test cases.
- * 
- * @author erdillon
- * 
- */
-public interface IInputConstants {
-
-	public static final int NUMBER_OF_SCHEMES = 2;
-
-	public static final String URI1 = "uri1";
-	public static final String URI2 = "uri2";
-
-	public static final String SCHEME1_ID = "org.eclipse.tigerstripe.annotations.test.scheme1";
-	public static final String SCHEME1_LABEL = "scheme1";
-
-	public static final String SCHEME2_ID = "org.eclipse.tigerstripe.annotations.test.scheme2";
-	public static final String SCHEME2_LABEL = "emptyScheme";
-
-	public static final String FORM1_ID = "org.eclipse.tigerstripe.annotations.test.scheme1.annotationForm1";
-	public static final String FORM2_ID = "org.eclipse.tigerstripe.annotations.test.scheme1.annotationForm2";
-	public static final String EMPTYFORM_ID = "org.eclipse.tigerstripe.annotations.scheme1.emptyForm";
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/SchemeSelector1.java b/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/SchemeSelector1.java
deleted file mode 100644
index 5c11497..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.test/src/org/eclipse/tigerstripe/annotations/test/input/SchemeSelector1.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. - Initial API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.test.input;
-
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-/**
- * 	Selector that selects on IInputConstants.URI1
- * 
- * @author erdillon
- *
- */
-public class SchemeSelector1 implements ISelector {
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	public boolean select(String URI) {
-		return URI.equals(IInputConstants.URI1);
-	}
-
-	public void setContext(Object context) {
-		// TODO Auto-generated method stub
-
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/.classpath b/plugins/org.eclipse.tigerstripe.annotations.ui/.classpath
deleted file mode 100644
index d775791..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/java"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/.project b/plugins/org.eclipse.tigerstripe.annotations.ui/.project
deleted file mode 100644
index 8b06280..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotations.ui</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.annotations.ui/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotations.ui/META-INF/MANIFEST.MF
deleted file mode 100644
index 56d802e..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,12 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Annotation UI Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotations.ui;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-Activator: org.eclipse.tigerstripe.annotations.ui.Activator
-Require-Bundle: org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.tigerstripe.annotations
-Eclipse-LazyStart: true
-Bundle-ClassPath: .
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/build.properties b/plugins/org.eclipse.tigerstripe.annotations.ui/build.properties
deleted file mode 100644
index 5a26c6c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/build.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-source.. = src/java/
-output.. = bin/
-bin.includes = META-INF/,\
-               .,\
-               plugin.xml,\
-               src/icons/
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/plugin.xml b/plugins/org.eclipse.tigerstripe.annotations.ui/plugin.xml
deleted file mode 100644
index 926f1a6..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/plugin.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.eclipse.tigerstripe.annotations"
-            name="Annotations">
-      </category>
-      <view
-            category="org.eclipse.tigerstripe.annotations"
-            class="org.eclipse.tigerstripe.annotations.ui.views.AnnotationsView"
-            icon="src/icons/ts_logo.gif.gif"
-            id="org.eclipse.tigerstripe.annotation.ui.views.AnnotationsView"
-            name="Annotations">
-      </view>
-   </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/icons/ts_logo.gif.gif b/plugins/org.eclipse.tigerstripe.annotations.ui/src/icons/ts_logo.gif.gif
deleted file mode 100644
index b617a96..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/icons/ts_logo.gif.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/Activator.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/Activator.java
deleted file mode 100644
index 9de89bb..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/Activator.java
+++ /dev/null
@@ -1,100 +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:
- *    J. Strawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.MultiStatus;
-import org.eclipse.core.runtime.Status;
-import org.eclipse.ui.plugin.AbstractUIPlugin;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends AbstractUIPlugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tigerstripe.annotation.ui";
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	public static String getPluginId() {
-		return PLUGIN_ID;
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public static void log(Throwable e) {
-		if (e.getCause() == null) {
-			IStatus status = new Status(IStatus.ERROR, getPluginId(),
-					IStatus.ERROR, "Internal Error", e); //$NON-NLS-1$
-			log(status);
-			return;
-		} else {
-			MultiStatus mStatus = new MultiStatus(getPluginId(), IStatus.ERROR,
-					"Internal Error", e);
-			Throwable ee = e.getCause();
-
-			while (ee != null) {
-				IStatus subStatus = new Status(IStatus.ERROR, getPluginId(),
-						IStatus.ERROR, "Internal Error", ee); //$NON-NLS-1$
-				mStatus.add(subStatus);
-				if (e.getCause() instanceof Exception) {
-					ee = ee.getCause();
-				} else {
-					break;
-				}
-			}
-			log(mStatus);
-			return;
-		}
-	}
-
-	public static void log(IStatus status) {
-		// add the status message to the "Problems" view
-		getDefault().getLog().log(status);
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationFormManager.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationFormManager.java
deleted file mode 100644
index b9b9152..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationFormManager.java
+++ /dev/null
@@ -1,312 +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:
- *    J. Strawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui.internal;
-
-import java.util.Arrays;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.ModifyEvent;
-import org.eclipse.swt.events.ModifyListener;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Color;
-import org.eclipse.swt.graphics.Font;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.GridData;
-import org.eclipse.swt.layout.GridLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Control;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.swt.widgets.Text;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationStore;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecificationLiteral;
-import org.eclipse.tigerstripe.annotations.IBigStringAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IBooleanAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IEnumerationAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IStringAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ui.Activator;
-import org.eclipse.tigerstripe.annotations.ui.views.AnnotationsView;
-import org.eclipse.ui.themes.ColorUtil;
-
-public class AnnotationFormManager {
-
-	private static final String ANNOTATION_SPEC = "ANNOTATION_SPEC";
-
-	private static Font ERROR_FONT = new Font(null, "arial", 8, SWT.BOLD);
-	private static Font REGULAR_FOND = new Font(null, "arial", 8, SWT.None);
-
-	private static Color ERROR_COLOR = new Color(null, 232, 123, 20);
-	private static Color REGULAR_COLOR = new Color(null, 0, 0, 0);
-
-	public static Composite createFormComposite(Composite parent,
-			IAnnotationForm form, final AnnotationsView view) {
-
-		GridData gridData;
-
-		Composite composite = new Composite(parent, SWT.NONE);
-		composite.setLayout(new GridLayout(2, false));
-
-		IAnnotationSpecification[] specifications = form.getSpecifications();
-		Arrays.sort(specifications, new AnnotationSpecificationComparator());
-		for (IAnnotationSpecification spec : specifications) {
-
-			if (spec instanceof IBigStringAnnotationSpecification) {
-
-				Label label = new Label(composite, SWT.LEFT);
-				label.setText(spec.getUserLabel());
-				Text text = new Text(composite, SWT.WRAP | SWT.MULTI
-						| SWT.V_SCROLL | SWT.BORDER);
-				gridData = new GridData();
-				gridData.horizontalAlignment = GridData.FILL;
-				gridData.grabExcessHorizontalSpace = true;
-				gridData.heightHint = 50;
-				text.setLayoutData(gridData);
-				text.setData(ANNOTATION_SPEC, spec);
-				final Text fText = text;
-				final IAnnotationSpecification fSpec = spec;
-				final Label fLabel = label;
-				text.addModifyListener(new ModifyListener() {
-
-					public void modifyText(ModifyEvent e) {
-						view.markModified();
-						try {
-							IStatus status = fSpec.validateValue(fText
-									.getText().trim());
-							if (status.isOK()) {
-								fLabel.setForeground(REGULAR_COLOR);
-								fLabel.setFont(REGULAR_FOND);
-								fText.setToolTipText("");
-							} else {
-								fLabel.setForeground(ERROR_COLOR);
-								fLabel.setFont(ERROR_FONT);
-								fText.setToolTipText(status.getMessage());
-							}
-						} catch (AnnotationCoreException ee) {
-							Activator.log(ee);
-						}
-					}
-
-				});
-
-			} else if (spec instanceof IStringAnnotationSpecification) {
-
-				Label label = new Label(composite, SWT.LEFT);
-				label.setText(spec.getUserLabel());
-				Text text = new Text(composite, SWT.SINGLE | SWT.BORDER);
-				gridData = new GridData();
-				gridData.horizontalAlignment = GridData.FILL;
-				gridData.grabExcessHorizontalSpace = true;
-				text.setLayoutData(gridData);
-				text.setData(ANNOTATION_SPEC, spec);
-				text.addModifyListener(new ModifyListener() {
-
-					public void modifyText(ModifyEvent e) {
-						view.markModified();
-					}
-
-				});
-
-			} else if (spec instanceof IBooleanAnnotationSpecification) {
-
-				Button checkbox = new Button(composite, SWT.CHECK);
-				gridData = new GridData();
-				gridData.horizontalSpan = 2;
-				gridData.verticalIndent = 3;
-				checkbox.setLayoutData(gridData);
-				checkbox.setData(ANNOTATION_SPEC, spec);
-				checkbox.setText(spec.getUserLabel());
-				checkbox.addSelectionListener(new SelectionListener() {
-
-					public void widgetDefaultSelected(SelectionEvent e) {
-						widgetSelected(e);
-					}
-
-					public void widgetSelected(SelectionEvent e) {
-						view.markModified();
-					}
-
-				});
-
-			} else if (spec instanceof IEnumerationAnnotationSpecification) {
-
-				Label label = new Label(composite, SWT.LEFT);
-				label.setText(spec.getUserLabel());
-				ComboViewer comboViewer = new ComboViewer(composite,
-						SWT.DROP_DOWN | SWT.READ_ONLY);
-				comboViewer.setLabelProvider(new ILabelProvider() {
-
-					public Image getImage(Object element) {
-						return null;
-					}
-
-					public String getText(Object element) {
-						IAnnotationSpecificationLiteral literal = (IAnnotationSpecificationLiteral) element;
-						return literal.getValue();
-					}
-
-					public void addListener(ILabelProviderListener listener) {
-					}
-
-					public void dispose() {
-					}
-
-					public boolean isLabelProperty(Object element,
-							String property) {
-						return false;
-					}
-
-					public void removeListener(ILabelProviderListener listener) {
-					}
-
-				});
-
-				gridData = new GridData();
-				gridData.horizontalAlignment = GridData.FILL;
-				gridData.grabExcessHorizontalSpace = true;
-				comboViewer.getCombo().setLayoutData(gridData);
-				IAnnotationSpecificationLiteral[] literals = ((IEnumerationAnnotationSpecification) spec)
-						.getLiterals();
-				Arrays.sort(literals,
-						new AnnotationSpecificationLiteralComparator());
-				comboViewer.add(literals);
-				comboViewer.getCombo().setData(ANNOTATION_SPEC, spec);
-				comboViewer.getCombo().addSelectionListener(
-						new SelectionListener() {
-
-							public void widgetDefaultSelected(SelectionEvent e) {
-								widgetSelected(e);
-							}
-
-							public void widgetSelected(SelectionEvent e) {
-								view.markModified();
-							}
-
-						});
-
-			}
-
-		}
-		return composite;
-
-	}
-
-	public static void setFormCompositeData(Composite composite,
-			AnnotationStore store, String URI, boolean useDefault) {
-
-		IAnnotationSpecification spec;
-
-		Control[] controls = composite.getChildren();
-		for (Control control : controls) {
-
-			try {
-				spec = (IAnnotationSpecification) control
-						.getData(ANNOTATION_SPEC);
-				if (control instanceof Text) {
-
-					String annotation = (String) store.getAnnotation(spec, URI);
-					if (annotation == null || useDefault) {
-						String value = (spec.getDefaultValue() != null) ? spec
-								.getDefaultValue() : "";
-						((Text) control).setText(value);
-					} else {
-						((Text) control).setText(annotation);
-					}
-
-				} else if (control instanceof Button) {
-
-					Boolean annotation = (Boolean) store.getAnnotation(spec,
-							URI);
-					if (annotation == null || useDefault) {
-						String value = (spec.getDefaultValue() != null) ? spec
-								.getDefaultValue() : "false";
-						((Button) control).setSelection(Boolean
-								.getBoolean(value));
-					} else {
-						((Button) control).setSelection(annotation);
-					}
-
-				} else if (control instanceof Combo) {
-
-					String annotation = (String) store.getAnnotation(spec, URI);
-					if (annotation == null || useDefault) {
-						String value = (spec.getDefaultValue() != null) ? spec
-								.getDefaultValue() : "";
-						((Combo) control).setText(value);
-					} else {
-						((Combo) control).setText(annotation);
-					}
-
-				}
-			} catch (AnnotationCoreException e) {
-				Activator.log(e);
-			}
-		}
-	}
-
-	public static void writeFormCompositeData(Composite composite,
-			AnnotationStore store, String URI) {
-
-		IAnnotationSpecification spec;
-
-		Control[] controls = composite.getChildren();
-		try {
-			for (Control control : controls) {
-
-				spec = (IAnnotationSpecification) control
-						.getData(ANNOTATION_SPEC);
-				if (control instanceof Text) {
-					if (((Text) control).getText() != null
-							|| !((Text) control).getText().equals("")) {
-						store.setAnnotation(spec, URI, ((Text) control)
-								.getText());
-					}
-				} else if (control instanceof Button) {
-					store.setAnnotation(spec, URI, ((Button) control)
-							.getSelection());
-				} else if (control instanceof Combo) {
-					if (((Combo) control).getText() != null
-							|| !((Combo) control).getText().equals("")) {
-						store.setAnnotation(spec, URI, ((Combo) control)
-								.getText());
-					}
-				}
-			}
-			store.store();
-		} catch (AnnotationCoreException e) {
-			Activator.log(e);
-		}
-
-	}
-
-	public static void clearFormCompositeData(Composite composite) {
-
-		for (Control control : composite.getChildren()) {
-			if (control instanceof Text) {
-				((Text) control).setText("");
-			} else if (control instanceof Button) {
-				((Button) control).setSelection(false);
-			} else if (control instanceof Combo) {
-				// temp!
-				((Combo) control).setText("<empty>");
-			}
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSchemeComparator.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSchemeComparator.java
deleted file mode 100644
index b0df219..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSchemeComparator.java
+++ /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:
- *    jistrawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui.internal;
-
-import java.util.Comparator;
-
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-
-public class AnnotationSchemeComparator implements
-		Comparator<IAnnotationScheme> {
-
-	public int compare(IAnnotationScheme scheme1, IAnnotationScheme scheme2) {
-
-		return scheme1.getNamespaceUserLabel().compareTo(
-				scheme2.getNamespaceUserLabel());
-
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSpecificationComparator.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSpecificationComparator.java
deleted file mode 100644
index 948552f..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSpecificationComparator.java
+++ /dev/null
@@ -1,26 +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:
- *    J. Strawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui.internal;
-
-import java.util.Comparator;
-
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-
-public class AnnotationSpecificationComparator implements
-		Comparator<IAnnotationSpecification> {
-
-	public int compare(IAnnotationSpecification spec1,
-			IAnnotationSpecification spec2) {
-
-		return (spec1.getIndex() - spec2.getIndex());
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSpecificationLiteralComparator.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSpecificationLiteralComparator.java
deleted file mode 100644
index 3507770..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/AnnotationSpecificationLiteralComparator.java
+++ /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:
- *    jistrawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui.internal;
-
-import java.util.Comparator;
-
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecificationLiteral;
-
-public class AnnotationSpecificationLiteralComparator implements
-		Comparator<IAnnotationSpecificationLiteral> {
-
-	public int compare(IAnnotationSpecificationLiteral literal1,
-			IAnnotationSpecificationLiteral literal2) {
-
-		return (literal1.getIndex() - literal2.getIndex());
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/DefaultAnnotable.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/DefaultAnnotable.java
deleted file mode 100644
index 784647c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/DefaultAnnotable.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.annotations.ui.internal;
-
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationStore;
-import org.eclipse.tigerstripe.annotations.IAnnotable;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-
-public class DefaultAnnotable implements IAnnotable {
-
-	private IResource resource;
-
-	public DefaultAnnotable(IResource resource) {
-		this.resource = resource;
-	}
-
-	public AnnotationStore getStore( IAnnotationScheme scheme ) throws AnnotationCoreException {
-		return AnnotationStore.getDefaultFactory().getAnnotationStore(
-				resource.getProject(), scheme);
-	}
-
-	public String getURI() throws AnnotationCoreException {
-		IAdaptable adaptable = (IAdaptable) resource;
-		if (adaptable.getAdapter(IProject.class) != null) {
-			String uri = resource.getLocationURI().toString();
-			uri = uri.replaceAll("file:/", "project:/");
-			return uri;
-		} else {
-			return resource.getLocationURI().toString();
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/widgets/AnnotationFormComposite.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/widgets/AnnotationFormComposite.java
deleted file mode 100644
index 0b7d96e..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/internal/widgets/AnnotationFormComposite.java
+++ /dev/null
@@ -1,27 +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:
- *    J. Strawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui.internal.widgets;
-
-import org.eclipse.swt.widgets.Composite;
-
-/**
- * This class is used to define type only. No additional functionality.
- * 
- * @author jistrawn
- * 
- */
-public class AnnotationFormComposite extends Composite {
-
-	public AnnotationFormComposite(Composite parent, int style) {
-		super(parent, style);
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/views/AnnotationsView.java b/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/views/AnnotationsView.java
deleted file mode 100644
index 35af509..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations.ui/src/java/org/eclipse/tigerstripe/annotations/ui/views/AnnotationsView.java
+++ /dev/null
@@ -1,434 +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:
- *    J. Strawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.ui.views;
-
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IResource;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.jface.viewers.ArrayContentProvider;
-import org.eclipse.jface.viewers.ComboViewer;
-import org.eclipse.jface.viewers.ILabelProvider;
-import org.eclipse.jface.viewers.ILabelProviderListener;
-import org.eclipse.jface.viewers.ISelection;
-import org.eclipse.jface.viewers.ISelectionChangedListener;
-import org.eclipse.jface.viewers.IStructuredSelection;
-import org.eclipse.jface.viewers.SelectionChangedEvent;
-import org.eclipse.swt.SWT;
-import org.eclipse.swt.custom.ScrolledComposite;
-import org.eclipse.swt.custom.StackLayout;
-import org.eclipse.swt.events.SelectionEvent;
-import org.eclipse.swt.events.SelectionListener;
-import org.eclipse.swt.graphics.Image;
-import org.eclipse.swt.layout.FormAttachment;
-import org.eclipse.swt.layout.FormData;
-import org.eclipse.swt.layout.FormLayout;
-import org.eclipse.swt.widgets.Button;
-import org.eclipse.swt.widgets.Combo;
-import org.eclipse.swt.widgets.Composite;
-import org.eclipse.swt.widgets.Label;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationSchemeRegistry;
-import org.eclipse.tigerstripe.annotations.AnnotationStore;
-import org.eclipse.tigerstripe.annotations.IAnnotable;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.ui.Activator;
-import org.eclipse.tigerstripe.annotations.ui.internal.AnnotationFormManager;
-import org.eclipse.tigerstripe.annotations.ui.internal.AnnotationSchemeComparator;
-import org.eclipse.tigerstripe.annotations.ui.internal.DefaultAnnotable;
-import org.eclipse.ui.ISelectionListener;
-import org.eclipse.ui.IWorkbenchPart;
-import org.eclipse.ui.part.ViewPart;
-
-public class AnnotationsView extends ViewPart {
-
-	private Button defaults;
-
-	private Button apply;
-
-	private Button cancel;
-
-	private Composite formComposite;
-
-	private ComboViewer schemeComboViewer;
-
-	// The current annotatble.
-	private IAnnotable currentAnnotable;
-
-	private String currentURI;
-
-	private boolean isDirty = false;
-
-	// private IResource resource;
-
-	private ISelectionListener pageSelectionListener;
-
-	private Map<String, String> schemeForUriMap = new HashMap<String, String>();
-
-	// Move map for form manager??
-	private Map<String, Composite> formCompositeMap = new HashMap<String, Composite>();
-
-	private final class SchemeLabelProvider implements ILabelProvider {
-
-		public Image getImage(Object element) {
-			return null;
-		}
-
-		public String getText(Object element) {
-			return ((IAnnotationScheme) element).getNamespaceUserLabel();
-		}
-
-		public void dispose() {
-		}
-
-		public boolean isLabelProperty(Object element, String property) {
-			return false;
-		}
-
-		public void removeListener(ILabelProviderListener listener) {
-		}
-
-		public void addListener(ILabelProviderListener listener) {
-		}
-	}
-
-	public AnnotationsView() {
-	}
-
-	public void markModified() {
-		setDirty(true);
-		updateButtonState();
-	}
-
-	protected void setDirty(boolean isDirty) {
-		this.isDirty = isDirty;
-	}
-
-	protected boolean isDirty() {
-		return this.isDirty;
-	}
-
-	protected String getCurrentURI() throws AnnotationCoreException {
-		if (currentAnnotable == null)
-			throw new AnnotationCoreException("No current annotable");
-		return this.currentURI;
-	}
-
-	protected void setCurrentAnnotable(IAnnotable annotable)
-			throws AnnotationCoreException {
-		this.currentAnnotable = annotable;
-		currentURI = null;
-		if (annotable != null)
-			currentURI = annotable.getURI();
-	}
-
-	protected IAnnotable getCurrentAnnotable() {
-		return this.currentAnnotable;
-	}
-
-	@Override
-	public void setFocus() {
-	}
-
-	@Override
-	public void dispose() {
-		super.dispose();
-		if (pageSelectionListener != null) {
-			getSite().getPage().removeSelectionListener(pageSelectionListener);
-		}
-	}
-
-	@Override
-	public void createPartControl(Composite parent) {
-
-		FormData formData;
-
-		parent.setLayout(new FormLayout());
-
-		Label label = new Label(parent, SWT.LEFT);
-		label.setText("Annotation Scheme: ");
-		formData = new FormData();
-		formData.top = new FormAttachment(0, 5);
-		formData.left = new FormAttachment(0, 5);
-		formData.right = new FormAttachment(100, -5);
-		label.setLayoutData(formData);
-
-		schemeComboViewer = new ComboViewer(parent, SWT.DROP_DOWN
-				| SWT.READ_ONLY);
-		schemeComboViewer.setLabelProvider(new SchemeLabelProvider());
-		schemeComboViewer.setContentProvider(new ArrayContentProvider());
-		schemeComboViewer
-				.addSelectionChangedListener(new ISelectionChangedListener() {
-					public void selectionChanged(SelectionChangedEvent event) {
-						schemeComboSelectionChanged(event);
-					}
-				});
-
-		Combo schemeCombo = schemeComboViewer.getCombo();
-		formData = new FormData();
-		formData.top = new FormAttachment(label, 5);
-		formData.left = new FormAttachment(0, 5);
-		formData.right = new FormAttachment(100, -5);
-		schemeCombo.setLayoutData(formData);
-
-		cancel = new Button(parent, SWT.PUSH);
-		cancel.setText("Cancel");
-		formData = new FormData();
-		formData.right = new FormAttachment(100, -5);
-		formData.bottom = new FormAttachment(100, -5);
-		cancel.setLayoutData(formData);
-		cancel.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				processButtonEvent(e);
-			}
-		});
-
-		apply = new Button(parent, SWT.PUSH);
-		apply.setText("&Apply");
-		formData = new FormData();
-		formData.right = new FormAttachment(cancel, -5);
-		formData.bottom = new FormAttachment(100, -5);
-		apply.setLayoutData(formData);
-		apply.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				processButtonEvent(e);
-			}
-		});
-
-		defaults = new Button(parent, SWT.PUSH);
-		defaults.setText("Restore &Defaults");
-		formData = new FormData();
-		formData.right = new FormAttachment(apply, -5);
-		formData.bottom = new FormAttachment(100, -5);
-		defaults.setLayoutData(formData);
-		defaults.addSelectionListener(new SelectionListener() {
-			public void widgetDefaultSelected(SelectionEvent e) {
-				widgetSelected(e);
-			}
-
-			public void widgetSelected(SelectionEvent e) {
-				processButtonEvent(e);
-			}
-
-		});
-
-		formComposite = new Composite(parent, SWT.NONE);
-		formData = new FormData();
-		formData.top = new FormAttachment(schemeCombo, 5);
-		formData.bottom = new FormAttachment(cancel, -5);
-		formData.left = new FormAttachment(0, 5);
-		formData.right = new FormAttachment(100, -5);
-		formComposite.setLayoutData(formData);
-		formComposite.setLayout(new StackLayout());
-
-		hookPageSelection();
-		updateButtonState();
-	}
-
-	private void pageSelectionChanged(IWorkbenchPart part, ISelection selection) {
-
-		if (part == this) {
-			return;
-		}
-		if (!(selection instanceof IStructuredSelection)) {
-			return;
-		}
-
-		IStructuredSelection structuredSelection = (IStructuredSelection) selection;
-		Object element = structuredSelection.getFirstElement();
-		if (!(element instanceof IAdaptable)) {
-			return;
-		}
-
-		IAdaptable adaptable = (IAdaptable) element;
-
-		try {
-			// First try to adapt as a IAnnotable
-			setCurrentAnnotable((IAnnotable) adaptable
-					.getAdapter(IAnnotable.class));
-			if (getCurrentAnnotable() == null) {
-				// Try then to default to IResource and build a fake annotable
-				IResource res = (IResource) adaptable
-						.getAdapter(IResource.class);
-				if (res != null) {
-					setCurrentAnnotable(new DefaultAnnotable(res));
-				}
-			}
-
-			if (getCurrentAnnotable() == null) {
-				schemeComboViewer.setInput(new String[] {});
-				schemeComboViewer.getCombo().setEnabled(false);
-				((StackLayout) formComposite.getLayout()).topControl = null;
-				formComposite.getParent().layout(true, true);
-			} else {
-
-				try {
-					int index = 0;
-					IAnnotationScheme[] schemes = AnnotationSchemeRegistry.eINSTANCE
-							.getDefinedSchemes(getCurrentURI());
-					Arrays.sort(schemes, new AnnotationSchemeComparator());
-					schemeComboViewer.getCombo().setEnabled(true);
-					schemeComboViewer.setInput(schemes);
-
-					// get selected scheme for a particular URI
-					String schemeUserId = schemeForUriMap
-							.get(getSchemeTypeURI());
-					if (schemeUserId != null) {
-						index = getSchemeIndexFromCombo(schemeUserId);
-					}
-
-					schemeComboViewer.getCombo().select(index);
-					schemeComboViewer.setSelection(schemeComboViewer
-							.getSelection());
-				} catch (AnnotationCoreException e) {
-					Activator.log(e);
-				}
-			}
-		} catch (AnnotationCoreException e) {
-			Activator.log(e);
-		}
-		setDirty(false);
-		updateButtonState();
-	}
-
-	private int getSchemeIndexFromCombo(String schemeUserId) {
-
-		for (int i = 0; i < schemeComboViewer.getCombo().getItemCount(); i++) {
-			if (schemeUserId.equals(schemeComboViewer.getCombo().getItem(i))) {
-				return i;
-			}
-		}
-		return 0;
-	}
-
-	private void schemeComboSelectionChanged(SelectionChangedEvent event) {
-
-		IStructuredSelection selection = (IStructuredSelection) event
-				.getSelection();
-		if (!(selection.getFirstElement() instanceof IAnnotationScheme)) {
-			return;
-		}
-
-		IAnnotationScheme scheme = (IAnnotationScheme) selection
-				.getFirstElement();
-
-		Composite composite = null;
-		IAnnotationForm form = null;
-
-		try {
-			// maintain selected scheme for a particular URI if previously
-			// visited
-			schemeForUriMap.put(getSchemeTypeURI(), scheme
-					.getNamespaceUserLabel());
-
-			form = scheme.selectForm(getCurrentURI());
-			if (form == null) {
-				((StackLayout) formComposite.getLayout()).topControl = null;
-				formComposite.getParent().layout(true, true);
-				return;
-			}
-			composite = (Composite) formCompositeMap.get(form.getID());
-			if (composite == null) {
-				composite = AnnotationFormManager.createFormComposite(
-						formComposite, form, this);
-				formCompositeMap.put(form.getID(), composite);
-			}
-
-			AnnotationFormManager.clearFormCompositeData(composite);
-			AnnotationStore store = currentAnnotable.getStore(scheme);
-			AnnotationFormManager.setFormCompositeData(composite, store,
-					getCurrentURI(), false);
-		} catch (AnnotationCoreException e) {
-			Activator.log(e);
-		}
-
-		formComposite.setData(form);
-		((StackLayout) formComposite.getLayout()).topControl = composite;
-
-		formComposite.getParent().layout(true, true);
-	}
-
-	private void processButtonEvent(SelectionEvent event) {
-
-		Composite composite = null;
-		IAnnotationForm form = null;
-		AnnotationStore store = null;
-
-		try {
-			form = (IAnnotationForm) formComposite.getData();
-			store = currentAnnotable.getStore(form.getScheme());
-			composite = (Composite) ((StackLayout) formComposite.getLayout()).topControl;
-
-			if (event.getSource() == apply) {
-				AnnotationFormManager.writeFormCompositeData(composite, store,
-						getCurrentURI());
-				setDirty(false);
-			} else if (event.getSource() == defaults) {
-				AnnotationFormManager.setFormCompositeData(composite, store,
-						getCurrentURI(), true);
-				setDirty(true);
-			} else if (event.getSource() == cancel) {
-				AnnotationFormManager.setFormCompositeData(composite, store,
-						getCurrentURI(), false);
-				setDirty(false);
-			}
-			updateButtonState();
-		} catch (AnnotationCoreException e) {
-			Activator.log(e);
-		}
-	}
-
-	// Temp until we sort out IAnnotable (hacked to work with .java files for
-	// now...)
-	private String getSchemeTypeURI() throws AnnotationCoreException {
-
-		String uri = getCurrentURI();
-		String type = uri.substring(0, uri.indexOf(':'));
-
-		// now see if .java file (i.e. ManagedEntity)
-		if (uri.indexOf('.') > 0) {
-			type += uri.substring(uri.indexOf('.'));
-		}
-
-		return type;
-
-	}
-
-	private void hookPageSelection() {
-		pageSelectionListener = new ISelectionListener() {
-			public void selectionChanged(IWorkbenchPart part,
-					ISelection selection) {
-				pageSelectionChanged(part, selection);
-			}
-		};
-		getSite().getPage().addSelectionListener(pageSelectionListener);
-	}
-
-	protected void updateButtonState() {
-		if (apply != null)
-			apply.setEnabled(isDirty());
-
-		if (cancel != null)
-			cancel.setEnabled(isDirty());
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/.classpath b/plugins/org.eclipse.tigerstripe.annotations/.classpath
deleted file mode 100644
index 751c8f2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.annotations/.project b/plugins/org.eclipse.tigerstripe.annotations/.project
deleted file mode 100644
index 8acb1b9..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.annotations</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.tigerstripe.annotations/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.annotations/META-INF/MANIFEST.MF
deleted file mode 100644
index 200b597..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,14 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: Tigerstripe Annotations Plug-in (Incubation)
-Bundle-SymbolicName: org.eclipse.tigerstripe.annotations;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.tigerstripe.annotations.Activator
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport,
- org.eclipse.core.resources;visibility:=reexport,
- org.eclipse.emf.ecore.xmi;visibility:=reexport,
- org.eclipse.emf.query;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tigerstripe.annotations
diff --git a/plugins/org.eclipse.tigerstripe.annotations/build.properties b/plugins/org.eclipse.tigerstripe.annotations/build.properties
deleted file mode 100644
index dec83d5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/build.properties
+++ /dev/null
@@ -1,9 +0,0 @@
-bin.includes = .,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               schema/,\
-               model/,\
-               icons/
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.tigerstripe.annotations/icons/sample.gif b/plugins/org.eclipse.tigerstripe.annotations/icons/sample.gif
deleted file mode 100644
index 34fb3c9..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/icons/sample.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.annotations/model/annotations.ecore b/plugins/org.eclipse.tigerstripe.annotations/model/annotations.ecore
deleted file mode 100644
index e8c25c3..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/model/annotations.ecore
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="context"
-    nsURI="http://www.eclipse.org/tigerstripe/schemas/annotations" nsPrefix="ann">
-  <eClassifiers xsi:type="ecore:EClass" name="AnnotationContext">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="annotations" upperBound="-1"
-        eType="#//Annotation" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="namespaceID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="Annotation">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="annotationSpecificationID"
-        lowerBound="1" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral=""/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EJavaObject"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="uri" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.tigerstripe.annotations/model/annotations.genmodel b/plugins/org.eclipse.tigerstripe.annotations/model/annotations.genmodel
deleted file mode 100644
index 156862a..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/model/annotations.genmodel
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.tigerstripe.annotations/src"
-    modelPluginID="org.eclipse.tigerstripe.annotations" modelName="Annotations" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="5.0" copyrightFields="false">
-  <foreignModel>annotations.ecore</foreignModel>
-  <genPackages prefix="Context" basePackage="org.eclipse.tigerstripe.annotations.internal"
-      disposableProviderFactory="true" ecorePackage="annotations.ecore#/">
-    <genClasses ecoreClass="annotations.ecore#//AnnotationContext">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference annotations.ecore#//AnnotationContext/annotations"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute annotations.ecore#//AnnotationContext/namespaceID"/>
-    </genClasses>
-    <genClasses ecoreClass="annotations.ecore#//Annotation">
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute annotations.ecore#//Annotation/annotationSpecificationID"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute annotations.ecore#//Annotation/value"/>
-      <genFeatures property="Readonly" createChild="false" ecoreFeature="ecore:EAttribute annotations.ecore#//Annotation/uri"/>
-    </genClasses>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.tigerstripe.annotations/plugin.properties b/plugins/org.eclipse.tigerstripe.annotations/plugin.properties
deleted file mode 100644
index 5f0d5ea..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.1 2008/01/16 18:14:19 edillon Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Annotations Model
-providerName = www.example.org
diff --git a/plugins/org.eclipse.tigerstripe.annotations/plugin.xml b/plugins/org.eclipse.tigerstripe.annotations/plugin.xml
deleted file mode 100644
index b4e8bce..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/plugin.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
-<plugin>
-   <extension-point id="scheme" name="org.eclipse.tigerstripe.annotations.scheme" schema="schema/scheme.exsd"/>
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "http://www.eclipse.org/tigerstripe/schemas/annotations" 
-       class = "org.eclipse.tigerstripe.annotations.internal.context.ContextPackage"
-       genModel = "model/annotations.genmodel" /> 
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.annotations/schema/scheme.exsd b/plugins/org.eclipse.tigerstripe.annotations/schema/scheme.exsd
deleted file mode 100644
index 3c1850c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/schema/scheme.exsd
+++ /dev/null
@@ -1,401 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tigerstripe.annotations">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.tigerstripe.annotations" id="scheme" name="org.eclipse.tigerstripe.annotations.scheme"/>
-      </appInfo>
-      <documentation>
-         [Enter description of this extension point.]
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <sequence>
-            <element ref="scheme"/>
-         </sequence>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="scheme">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="userLabel"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence>
-            <element ref="annotationForm" minOccurs="1" maxOccurs="unbounded"/>
-         </sequence>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="userLabel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="selector" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.ISelector"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="validator" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.IValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="stringAnnotationSpecification">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="userLabel"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="userLabel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="validator" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.IValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="defaultValue" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="index" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="bigStringAnnotationSpecification">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="userLabel"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="userLabel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="validator" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.IValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="defaultValue" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="index" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="booleanAnnotationSpecification">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="userLabel"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="userLabel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="validator" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.IValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="defaultValue" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="index" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="enumerationAnnotationSpecification">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="userLabel"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <element ref="literal"/>
-         </sequence>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="userLabel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="validator" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.IValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="defaultValue" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="index" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="annotationForm">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="ID"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <sequence minOccurs="1" maxOccurs="unbounded">
-            <choice>
-               <element ref="stringAnnotationSpecification"/>
-               <element ref="booleanAnnotationSpecification"/>
-               <element ref="enumerationAnnotationSpecification"/>
-               <element ref="bigStringAnnotationSpecification"/>
-            </choice>
-         </sequence>
-         <attribute name="ID" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="selector" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.ISelector"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="validator" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn=":org.eclipse.tigerstripe.annotations.IValidator"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="literal">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="value"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="value" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="index" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/Activator.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/Activator.java
deleted file mode 100644
index 24c3f63..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/Activator.java
+++ /dev/null
@@ -1,68 +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.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Plugin;
-import org.eclipse.core.runtime.Status;
-import org.osgi.framework.BundleContext;
-
-/**
- * The activator class controls the plug-in life cycle
- */
-public class Activator extends Plugin {
-
-	// The plug-in ID
-	public static final String PLUGIN_ID = "org.eclipse.tigerstripe.annotations";
-
-	// The shared instance
-	private static Activator plugin;
-
-	/**
-	 * The constructor
-	 */
-	public Activator() {
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#start(org.osgi.framework.BundleContext)
-	 */
-	public void start(BundleContext context) throws Exception {
-		super.start(context);
-		plugin = this;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see org.eclipse.ui.plugin.AbstractUIPlugin#stop(org.osgi.framework.BundleContext)
-	 */
-	public void stop(BundleContext context) throws Exception {
-		plugin = null;
-		super.stop(context);
-	}
-
-	/**
-	 * Returns the shared instance
-	 * 
-	 * @return the shared instance
-	 */
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public static void log(Throwable e) {
-		IStatus status = new Status(IStatus.ERROR, PLUGIN_ID, e.getMessage(), e);
-		plugin.getLog().log(status);
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationCoreException.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationCoreException.java
deleted file mode 100644
index b2241cf..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationCoreException.java
+++ /dev/null
@@ -1,36 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-public class AnnotationCoreException extends Exception {
-
-	public AnnotationCoreException() {
-		super();
-	}
-
-	public AnnotationCoreException(String message, Throwable cause) {
-		super(message, cause);
-	}
-
-	public AnnotationCoreException(String message) {
-		super(message);
-	}
-
-	public AnnotationCoreException(Throwable cause) {
-		super(cause);
-	}
-
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 6867636078001811590L;
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationSchemeRegistry.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationSchemeRegistry.java
deleted file mode 100644
index f65bffa..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationSchemeRegistry.java
+++ /dev/null
@@ -1,114 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.core.runtime.IExtensionPoint;
-import org.eclipse.core.runtime.IExtensionRegistry;
-import org.eclipse.core.runtime.Platform;
-import org.eclipse.tigerstripe.annotations.internal.AnnotationScheme;
-
-/**
- * A registry for all namespace definitions as found from the corresponding
- * Extension Point
- * 
- * @author erdillon
- * 
- */
-public class AnnotationSchemeRegistry {
-
-	public static final AnnotationSchemeRegistry eINSTANCE = new AnnotationSchemeRegistry();
-
-	private Map<String, IAnnotationScheme> schemesMap = null;
-
-	/**
-	 * Returns an array of all defined schemes for the given URI
-	 * 
-	 * The schemes are selected using the optional selector provided in the
-	 * definition of the scheme. If no selector was provided the scheme will be
-	 * selected by default.
-	 * 
-	 * @param uri -
-	 *            the uri to use as the key to get the defined schemes. If null
-	 *            all defined schemes are returned.
-	 * @return
-	 */
-	public IAnnotationScheme[] getDefinedSchemes(String uri)
-			throws AnnotationCoreException {
-		assertSchemesLoaded();
-
-		if (uri == null)
-			return schemesMap.values().toArray(
-					new IAnnotationScheme[schemesMap.values().size()]);
-		else {
-			List<IAnnotationScheme> result = new ArrayList<IAnnotationScheme>();
-			for (IAnnotationScheme scheme : schemesMap.values()) {
-				if (scheme.getSelector().select(uri))
-					result.add(scheme);
-			}
-			return result.toArray(new IAnnotationScheme[result.size()]);
-		}
-	}
-
-	/**
-	 * Reads all the extension points defining schemes if not already done.
-	 * 
-	 * @throws AnnotationCoreException
-	 */
-	private void assertSchemesLoaded() throws AnnotationCoreException {
-		if (schemesMap == null)
-			readExtensionPoints();
-	}
-
-	/**
-	 * Parses all the Schemes defined as extension points into the corresponding
-	 * objects to populate this registry.
-	 * 
-	 */
-	private void readExtensionPoints() throws AnnotationCoreException {
-
-		schemesMap = new HashMap<String, IAnnotationScheme>();
-
-		// Get all defined schemes from the corresponding Extension Point
-		IExtensionRegistry registry = Platform.getExtensionRegistry();
-		IExtensionPoint extensionPoint = registry
-				.getExtensionPoint(IAnnotationExtensionPoints.SCHEME);
-
-		IExtension extensions[] = extensionPoint.getExtensions();
-		for (int i = 0; i < extensions.length; i++) {
-			IAnnotationScheme scheme = new AnnotationScheme(extensions[i]);
-			schemesMap.put(scheme.getNamespaceID(), scheme);
-		}
-	}
-
-	/**
-	 * Returns the Scheme for the given ID
-	 * 
-	 * @param ID
-	 * @return the scheme defined with the given ID, null otherwise
-	 * @throws AnnotationCoreException
-	 */
-	public IAnnotationScheme getAnnotationSchemeByID(String ID)
-			throws AnnotationCoreException {
-		assertSchemesLoaded();
-
-		if (schemesMap.containsKey(ID)) {
-			return schemesMap.get(ID);
-		}
-
-		return null;
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationStore.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationStore.java
deleted file mode 100644
index ecb24a4..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/AnnotationStore.java
+++ /dev/null
@@ -1,97 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-import org.eclipse.tigerstripe.annotations.internal.DefaultAnnotationStoreFactory;
-
-public abstract class AnnotationStore {
-
-	private static Class defaultAnnotationStoreFactoryClass;
-	private static IAnnotationStoreFactory factory;
-
-	/**
-	 * Registers the default AnnotationStoreFactory
-	 * 
-	 * @param factoryClass
-	 */
-	public static void registerDefaultAnnotationStoreFactory(Class factoryClass) {
-		defaultAnnotationStoreFactoryClass = factoryClass;
-	}
-
-	public static IAnnotationStoreFactory getDefaultFactory()
-			throws AnnotationCoreException {
-		if (defaultAnnotationStoreFactoryClass == null) {
-			registerDefaultAnnotationStoreFactory(DefaultAnnotationStoreFactory.class);
-
-			try {
-				factory = (IAnnotationStoreFactory) defaultAnnotationStoreFactoryClass
-						.newInstance();
-			} catch (IllegalAccessException e) {
-				throw new AnnotationCoreException(
-						"Can't instantiate AnnotationStoreFactory: "
-								+ e.getMessage(), e);
-			} catch (InstantiationException e) {
-				throw new AnnotationCoreException(
-						"Can't instantiate AnnotationStoreFactory: "
-								+ e.getMessage(), e);
-			}
-		}
-		return factory;
-	}
-
-	// =============================================================
-
-	/**
-	 * Updates the store after a URI change (resource renamed/moved e.g.)
-	 */
-	public abstract void uriChanged(String oldURI, String newURI)
-			throws AnnotationCoreException;
-
-	public abstract void uriRemoved(String URI) throws AnnotationCoreException;
-
-	public abstract void setAnnotation(IAnnotationSpecification specification,
-			String URI, Object Value) throws AnnotationCoreException;
-
-	public abstract void unsetAnnotation(
-			IAnnotationSpecification specification, String URI)
-			throws AnnotationCoreException;
-
-	public abstract Object getAnnotation(
-			IAnnotationSpecification specification, String URI)
-			throws AnnotationCoreException;
-
-	/**
-	 * Return true if this store is dirty, i.e. it was modified locally and
-	 * needs to be saved.
-	 * 
-	 * @return
-	 * @throws AnnotationCoreException
-	 */
-	public abstract boolean isDirty() throws AnnotationCoreException;
-
-	/**
-	 * Loads the content of the store from persistent storage
-	 * 
-	 * As a result, the "dirty" flag is reset.
-	 * 
-	 * @throws AnnotationCoreException
-	 */
-	public abstract void load() throws AnnotationCoreException;
-
-	/**
-	 * Saves the content of the store to persistent storage.
-	 * 
-	 * As a result, the "dirty" flag is reset.
-	 * 
-	 * @throws AnnotationCoreException
-	 */
-	public abstract void store() throws AnnotationCoreException;
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotable.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotable.java
deleted file mode 100644
index 61f298c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotable.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. - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * IAnnotable should be implemented by clients of the Annotations framework for
- * all objects that is potentially annotable with the framework.
- * 
- * The idea is to have clients provide a mechanism to provide a KEY to use for
- * the annotations.
- * 
- * This is used by the annotation framework view to try and adapt the current
- * selection to an IAnnotable. If possible it will use this method to get the
- * Annotation URI.
- * 
- * @author erdillon
- * 
- */
-public interface IAnnotable {
-
-	/**
-	 * Returns the URI to use as the key for annotations related to this.
-	 * 
-	 * @return
-	 * @throws AnnotationCoreException
-	 */
-	public String getURI() throws AnnotationCoreException;
-
-	/**
-	 * The AnnotationStore to use for this.
-	 * 
-	 * Note that this may optionally return null, in which case a default store
-	 * will be provided by the framework.
-	 * 
-	 * @return
-	 * @param scheme -
-	 * @throws AnnotationCoreException
-	 */
-	public AnnotationStore getStore(IAnnotationScheme scheme)
-			throws AnnotationCoreException;
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationExtensionPoints.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationExtensionPoints.java
deleted file mode 100644
index 214cb6f..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationExtensionPoints.java
+++ /dev/null
@@ -1,22 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * Gathers in one spot all the known extension points
- * 
- * @author erdillon
- * 
- */
-public interface IAnnotationExtensionPoints {
-
-	public final static String SCHEME = "org.eclipse.tigerstripe.annotations.scheme";
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationForm.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationForm.java
deleted file mode 100644
index c41580f..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationForm.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. - Initial API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * 	An annotation form contains a set of possible annotations to be presented to the user for
- * a specific URI.
- * 
- * @author erdillon
- *
- */
-public interface IAnnotationForm {
-	
-	/**
-	 * 	Returns the scheme this form belongs to
-	 * 
-	 * @return
-	 */
-	public IAnnotationScheme getScheme();
-	
-	/**
-	 * 	Returns the selector defined for this form if any
-	 * 
-	 * @return
-	 */
-	public ISelector getSelector();
-	
-	/**
-	 * 	Returns the array of Annotation Specifications grouped in this form.
-	 * 
-	 * @return
-	 */
-	public IAnnotationSpecification[] getSpecifications();
-	
-	
-	public String getID();
-	
-	public IValidator getValidator();
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationScheme.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationScheme.java
deleted file mode 100644
index e51e153..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationScheme.java
+++ /dev/null
@@ -1,68 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * All details about an Annotation Scheme
- * 
- * 
- * 
- * @author erdillon
- * 
- */
-public interface IAnnotationScheme {
-
-	public IAnnotationScheme[] EMPTY_ARRAY = new IAnnotationScheme[0];
-
-	/**
-	 * Returns the NamespaceID defined by this scheme
-	 * 
-	 * @return
-	 */
-	public String getNamespaceID();
-
-	/**
-	 * Returns the user label to use for this AnnotationScheme
-	 * 
-	 * @return
-	 */
-	public String getNamespaceUserLabel();
-
-	/**
-	 * Returns the form that applies to the given URI in this scheme, or null
-	 * otherwise.
-	 * 
-	 * Note that if multiple forms could be applicable the first matching form
-	 * will be returned.
-	 * 
-	 * @param URI
-	 * @return
-	 */
-	public IAnnotationForm selectForm(String URI);
-
-	/**
-	 * Returns an array that contains all the defined forms for this scheme
-	 * 
-	 * @return
-	 */
-	public IAnnotationForm[] getDefinedForms();
-
-	/**
-	 * Returns the selector defined for this Scheme. If no selector was defined
-	 * through the corresponding extension point, ISelector.DEFAULT is returned.
-	 * 
-	 * @return
-	 */
-	public ISelector getSelector();
-
-	public IAnnotationSpecification findAnnotationSpecification(
-			String annotationSpecificationID) throws AnnotationCoreException;
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationSpecification.java
deleted file mode 100644
index 478c3d5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationSpecification.java
+++ /dev/null
@@ -1,64 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-import org.eclipse.core.runtime.IStatus;
-
-/**
- * Top-Level interface for all annotation specifications
- * 
- * @author erdillon
- * 
- */
-public interface IAnnotationSpecification {
-
-	public final static int UNDEF_INDEX = -1;
-
-	/**
-	 * Returns the AnnotationSpecification ID
-	 * 
-	 * @return
-	 */
-	public String getID();
-
-	/**
-	 * Returns the form where this IAnnotationSpecification is defined
-	 * 
-	 * @return
-	 */
-	public IAnnotationForm getParentForm();
-
-	/**
-	 * The user label for this Annotation Specification. This labels is the one
-	 * to appear in the GUI and be presented to the user in the Annotation View.
-	 * 
-	 * @return
-	 */
-	public String getUserLabel();
-
-	/**
-	 * Returns the default value for this Annotation Specification.
-	 * 
-	 * @return
-	 */
-	public String getDefaultValue();
-
-	/**
-	 * The index of the Annotation Specification should be used to specify the
-	 * order in which all specifications should be represented in the view.
-	 * 
-	 * @return
-	 */
-	public int getIndex();
-
-	public IStatus validateValue(String value) throws AnnotationCoreException;
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationSpecificationLiteral.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationSpecificationLiteral.java
deleted file mode 100644
index 25fecd2..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationSpecificationLiteral.java
+++ /dev/null
@@ -1,37 +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:
- *    jistrawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * Interface for the EnumerationAnnotationLiteral Object stored by
- * IEnumerationAnnotationSpecifications
- * 
- * @author jistrawn
- * 
- */
-public interface IAnnotationSpecificationLiteral {
-
-	/**
-	 * Returns the literal value for this EnumerationAnnotationSpecification.
-	 * 
-	 * @return
-	 */
-	public String getValue();
-
-	/**
-	 * The index of the EnumerationAnnotationSpecification literal should be
-	 * used to specify the order in which all literals should be represented in
-	 * the view.
-	 * 
-	 * @return
-	 */
-	public int getIndex();
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationStoreFactory.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationStoreFactory.java
deleted file mode 100644
index beabc3c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IAnnotationStoreFactory.java
+++ /dev/null
@@ -1,38 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-public interface IAnnotationStoreFactory {
-
-	/**
-	 * Returns all AnnotationStores for the given key
-	 * 
-	 * @param storeKey
-	 * @return
-	 * @throws AnnotationCoreException
-	 */
-	public AnnotationStore[] getAnnotationStores(Object storeKey)
-			throws AnnotationCoreException;
-
-	/**
-	 * Returns the AnnotationStore for the given key/scheme combo.
-	 * 
-	 * if this AnnotationStore had been used and contains information it will be loaded. 
-	 * Otherwise a new empty store is created.
-	 * 
-	 * @param storeKey
-	 * @param scheme
-	 * @return
-	 * @throws AnnotationCoreException
-	 */
-	public AnnotationStore getAnnotationStore(Object storeKey,
-			IAnnotationScheme scheme) throws AnnotationCoreException;
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IBigStringAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IBigStringAnnotationSpecification.java
deleted file mode 100644
index e900255..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IBigStringAnnotationSpecification.java
+++ /dev/null
@@ -1,21 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * 
- * @author erdillon
- * 
- */
-public interface IBigStringAnnotationSpecification extends
-		IStringAnnotationSpecification {
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IBooleanAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IBooleanAnnotationSpecification.java
deleted file mode 100644
index f158ae6..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IBooleanAnnotationSpecification.java
+++ /dev/null
@@ -1,21 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * 
- * @author erdillon
- *
- */
-public interface IBooleanAnnotationSpecification extends
-		IAnnotationSpecification {
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IEnumerationAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IEnumerationAnnotationSpecification.java
deleted file mode 100644
index c343b66..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IEnumerationAnnotationSpecification.java
+++ /dev/null
@@ -1,25 +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.annotations;
-
-import org.eclipse.tigerstripe.annotations.internal.AnnotationSpecificationLiteral;
-
-/**
- * 
- * @author erdillon
- *
- */
-public interface IEnumerationAnnotationSpecification extends
-		IAnnotationSpecification {
-
-	public AnnotationSpecificationLiteral[] getLiterals();
-	
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/ISelector.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/ISelector.java
deleted file mode 100644
index 41c8b17..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/ISelector.java
+++ /dev/null
@@ -1,50 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * This interface is to be implemented by classes acting as selectors for
- * Annotation namespaces or forms.
- * 
- */
-public interface ISelector {
-
-	// A default selector for convenience.
-	public static ISelector DEFAULT = new ISelector() {
-		public boolean isEnabled(IAnnotationSpecification spec, String URI)
-				throws AnnotationCoreException {
-			return true;
-		}
-
-		public boolean select(String URI) {
-			return true;
-		}
-
-		public void setContext(Object context) {
-		}
-	};
-
-	/**
-	 * Context initialization for this selector.
-	 * 
-	 * This method is called upon instantiation of the selector. The relevant
-	 * object will be passed whether it is used as a Namespace selector or a
-	 * Form Selector.
-	 * 
-	 * @param context
-	 */
-	public void setContext(Object context);
-
-	public boolean select(String URI);
-
-	public boolean isEnabled(IAnnotationSpecification spec, String URI)
-			throws AnnotationCoreException;
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IStringAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IStringAnnotationSpecification.java
deleted file mode 100644
index 1e4988c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IStringAnnotationSpecification.java
+++ /dev/null
@@ -1,21 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-/**
- * 
- * @author erdillon
- *
- */
-public interface IStringAnnotationSpecification extends
-		IAnnotationSpecification {
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IValidator.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IValidator.java
deleted file mode 100644
index eff2803..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/IValidator.java
+++ /dev/null
@@ -1,33 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations;
-
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.Status;
-
-public interface IValidator {
-
-	// A default validator for convenience.
-	public final static IValidator DEFAULT = new IValidator() {
-
-		public void setContext(Object context) {
-		}
-
-		public IStatus validateValue(String value)
-				throws AnnotationCoreException {
-			return Status.OK_STATUS;
-		}
-	};
-
-	public void setContext(Object context);
-
-	public IStatus validateValue(String value) throws AnnotationCoreException;
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationForm.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationForm.java
deleted file mode 100644
index 151f0d8..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationForm.java
+++ /dev/null
@@ -1,94 +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 API and Implementation
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-import org.eclipse.tigerstripe.annotations.IValidator;
-
-public class AnnotationForm implements IAnnotationForm {
-
-	private IAnnotationScheme scheme;
-	private ISelector selector = ISelector.DEFAULT;
-	private IValidator validator = IValidator.DEFAULT;
-	private String ID;
-
-	private Set<IAnnotationSpecification> specifications = new HashSet<IAnnotationSpecification>();
-
-	public IAnnotationScheme getScheme() {
-		return scheme;
-	}
-
-	public void setScheme(IAnnotationScheme scheme) {
-		this.scheme = scheme;
-	}
-
-	public ISelector getSelector() {
-		return selector;
-	}
-
-	public IAnnotationSpecification[] getSpecifications() {
-		return specifications
-				.toArray(new IAnnotationSpecification[specifications.size()]);
-	}
-
-	public IValidator getValidator() {
-		return validator;
-	}
-
-	public String getID() {
-		return ID;
-	}
-
-	public void parse(IConfigurationElement element)
-			throws AnnotationCoreException {
-		ID = element.getAttribute("ID");
-
-		// Extract Selector
-		try {
-			Object obj = element.createExecutableExtension("selector");
-			if (obj instanceof ISelector) {
-				selector = (ISelector) obj;
-				selector.setContext(this);
-			}
-		} catch (CoreException e) {
-			// this means no definition of selector... ignore.
-		}
-
-		// Extract Validator
-		try {
-			Object obj = element.createExecutableExtension("validator");
-			if (obj instanceof IValidator) {
-				validator = (IValidator) obj;
-				validator.setContext(this);
-			}
-		} catch (CoreException e) {
-			// this means no definition of selector... ignore.
-		}
-
-		// Parse the AnnotationSpecs
-		IConfigurationElement[] children = element.getChildren();
-		for (IConfigurationElement child : children) {
-			IAnnotationSpecification spec = AnnotationSpecificationFactory
-					.parseAnnotationSpecification(child, this);
-			if (spec != null)
-				specifications.add(spec);
-		}
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationScheme.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationScheme.java
deleted file mode 100644
index 8582f3d..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationScheme.java
+++ /dev/null
@@ -1,162 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IExtension;
-import org.eclipse.tigerstripe.annotations.Activator;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-
-public class AnnotationScheme implements IAnnotationScheme {
-
-	private String namespaceID = null;
-	private String namespaceUserLabel = null;
-	private ISelector selector = ISelector.DEFAULT;
-	private Set<IAnnotationForm> forms = new HashSet<IAnnotationForm>();
-
-	public AnnotationScheme(IExtension extension)
-			throws AnnotationCoreException {
-		parse(extension);
-	}
-
-	public String getNamespaceID() {
-		return this.namespaceID;
-	}
-
-	public String getNamespaceUserLabel() {
-		return this.namespaceUserLabel;
-	}
-
-	public IAnnotationForm[] getDefinedForms() {
-		return forms.toArray(new IAnnotationForm[forms.size()]);
-	}
-
-	public IAnnotationForm selectForm(String URI) {
-
-		if (URI == null)
-			return null;
-
-		// The priority is given to forms with defined selectors.
-		IAnnotationForm foundDefined = null;
-		IAnnotationForm foundDefault = null;
-		for (IAnnotationForm form : forms) {
-			if (form.getSelector().select(URI)) {
-				if (form == ISelector.DEFAULT) {
-					foundDefault = form;
-				} else {
-					foundDefined = form;
-					break;
-				}
-			}
-		}
-
-		if (foundDefined != null)
-			return foundDefined;
-		else if (foundDefault != null)
-			return foundDefault;
-		else
-			return null;
-	}
-
-	public ISelector getSelector() {
-		return selector;
-	}
-
-	private void parse(IExtension extension) throws AnnotationCoreException {
-		IConfigurationElement[] children = extension.getConfigurationElements();
-
-		// Extract the namespace details first
-		for (IConfigurationElement child : children) {
-			if ("scheme".equals(child.getName())) {
-				namespaceID = child.getAttribute("ID");
-				namespaceUserLabel = child.getAttribute("userLabel");
-				if (namespaceUserLabel == null)
-					namespaceUserLabel = namespaceID; // by default
-
-				// Extract Selector
-				try {
-					Object obj = child.createExecutableExtension("selector");
-					if (obj instanceof ISelector) {
-						selector = (ISelector) obj;
-						selector.setContext(this);
-					}
-				} catch (CoreException e) {
-					// this means no definition of selector... ignore.
-				}
-
-				IConfigurationElement[] formElements = child
-						.getChildren("annotationForm");
-				for (IConfigurationElement formElement : formElements) {
-					AnnotationForm form = new AnnotationForm();
-					try {
-						form.parse(formElement);
-						form.setScheme(this);
-						forms.add(form);
-					} catch (AnnotationCoreException e) {
-						Activator.log(e);
-					}
-				}
-			}
-		}
-
-		if (isValid().length != 0) {
-			throw new AnnotationCoreException();
-		}
-	}
-
-	/**
-	 * Returns an empty array if the scheme is valid. If not it returns an array
-	 * of reasons.
-	 * 
-	 * @return
-	 */
-	protected String[] isValid() {
-		List<String> result = new ArrayList<String>();
-
-		if (namespaceID == null || namespaceID.length() == 0) {
-			result.add("Scheme has no namespaceID.");
-		}
-
-		return result.toArray(new String[result.size()]);
-	}
-
-	public boolean equals(Object other) {
-		if (other instanceof IAnnotationScheme) {
-			IAnnotationScheme otherScheme = (IAnnotationScheme) other;
-			return getNamespaceID().equals(otherScheme.getNamespaceID());
-		}
-		return false;
-	}
-
-	public IAnnotationSpecification findAnnotationSpecification(
-			String annotationSpecificationID) throws AnnotationCoreException {
-		for (IAnnotationForm form : getDefinedForms()) {
-			for (IAnnotationSpecification spec : form.getSpecifications()) {
-				if (spec.getID().equals(annotationSpecificationID)) {
-					return spec;
-				}
-			}
-		}
-		throw new AnnotationCoreException(
-				"Undefined annotation specification: "
-						+ annotationSpecificationID);
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationSpecificationFactory.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationSpecificationFactory.java
deleted file mode 100644
index c40939e..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationSpecificationFactory.java
+++ /dev/null
@@ -1,68 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-
-/**
- * A Factory for all AnnotationSpecs
- * 
- * @author erdillon
- * 
- */
-public class AnnotationSpecificationFactory {
-
-	private static String[] annotationSpecKeys = {
-			"stringAnnotationSpecification", "booleanAnnotationSpecification",
-			"enumerationAnnotationSpecification",
-			"bigStringAnnotationSpecification" };
-
-	@SuppressWarnings("unchecked")
-	private static Class[] annotationSpecImpls = {
-			StringAnnotationSpecification.class,
-			BooleanAnnotationSpecification.class,
-			EnumerationAnnotationSpecification.class,
-			BigStringAnnotationSpecification.class };
-
-	/**
-	 * 
-	 * @param element
-	 * @param parentScheme
-	 * @return
-	 * @throws AnnotationCoreException
-	 */
-	public static IAnnotationSpecification parseAnnotationSpecification(
-			IConfigurationElement element, IAnnotationForm parentForm)
-			throws AnnotationCoreException {
-		BaseAnnotationSpecification result = null;
-		String elementName = element.getName();
-		for (int i = 0; i < annotationSpecKeys.length; i++) {
-			if (elementName.equals(annotationSpecKeys[i])) {
-				@SuppressWarnings("unchecked")
-				Class<BaseAnnotationSpecification> impl = annotationSpecImpls[i];
-				try {
-					result = impl.newInstance();
-					result.populate(element, parentForm);
-				} catch (IllegalAccessException e) {
-					AnnotationCoreException ee = new AnnotationCoreException(e);
-					throw ee;
-				} catch (InstantiationException e) {
-					AnnotationCoreException ee = new AnnotationCoreException(e);
-					throw ee;
-				}
-			}
-		}
-		return result;
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationSpecificationLiteral.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationSpecificationLiteral.java
deleted file mode 100644
index c2c3a38..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/AnnotationSpecificationLiteral.java
+++ /dev/null
@@ -1,38 +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:
- *    jistrawn (Cisco Systems, Inc.) - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecificationLiteral;
-
-public class AnnotationSpecificationLiteral implements IAnnotationSpecificationLiteral {
-
-	private String value;
-	
-	private int index = IAnnotationSpecification.UNDEF_INDEX;
-
-	public String getValue() {
-		return value;
-	}
-
-	public void setValue(String value) {
-		this.value = value;
-	}
-
-	public int getIndex() {
-		return index;
-	}
-
-	public void setIndex(int index) {
-		this.index = index;
-	}
-	
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BaseAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BaseAnnotationSpecification.java
deleted file mode 100644
index 7331e2c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BaseAnnotationSpecification.java
+++ /dev/null
@@ -1,121 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import javax.swing.text.html.HTMLDocument.HTMLReader.SpecialAction;
-
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.core.runtime.IStatus;
-import org.eclipse.tigerstripe.annotations.Activator;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.ISelector;
-import org.eclipse.tigerstripe.annotations.IValidator;
-import org.eclipse.tigerstripe.annotations.internal.context.Annotation;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextFactory;
-
-/**
- * This is the top level class for an annotation specification.
- * 
- * @author erdillon
- * 
- */
-public abstract class BaseAnnotationSpecification implements
-		IAnnotationSpecification {
-
-	private String _ID;
-	private IAnnotationForm parentForm;
-	private String userLabel;
-	private String defaultValue;
-	private int index = UNDEF_INDEX;
-
-	private IValidator validator = IValidator.DEFAULT;
-
-	private void setDefaultValue(String defaultValue) {
-		this.defaultValue = defaultValue;
-	}
-
-	public String getDefaultValue() {
-		return this.defaultValue;
-	}
-
-	public String getUserLabel() {
-		return this.userLabel;
-	}
-
-	public String getID() {
-		return _ID;
-	}
-
-	public IAnnotationForm getParentForm() {
-		return parentForm;
-	}
-
-	public int getIndex() {
-		return this.index;
-	}
-
-	/**
-	 * Populate this from the Element found in the Extension Point
-	 * 
-	 * @param element
-	 */
-	/* package */void populate(IConfigurationElement element,
-			IAnnotationForm parentForm) {
-		this.parentForm = parentForm;
-		this._ID = element.getAttribute("ID");
-		this.userLabel = element.getAttribute("userLabel");
-		setDefaultValue(element.getAttribute("defaultValue"));
-		String indexField = element.getAttribute("index");
-		if (indexField != null && indexField.length() != 0)
-			this.index = Integer.parseInt(indexField);
-
-		// Extract Validator
-		try {
-			Object obj = element.createExecutableExtension("validator");
-			if (obj instanceof IValidator) {
-				validator = (IValidator) obj;
-				validator.setContext(this);
-			}
-		} catch (CoreException e) {
-			// this means no definition of selector... ignore.
-			if (e.getCause() != null) {
-				Activator.log(e.getCause());
-			}
-		}
-
-	}
-
-	public boolean equals(Object other) {
-		if (other instanceof IAnnotationSpecification) {
-			IAnnotationSpecification otherSpec = (IAnnotationSpecification) other;
-			return otherSpec.getID().equals(getID())
-					&& otherSpec.getParentForm().equals(getParentForm());
-		}
-		return false;
-	}
-
-	public Annotation makeAnnotation(String URI) {
-		Annotation ann = ContextFactory.eINSTANCE.createAnnotation();
-		ann.setAnnotationSpecificationID(getID());
-		ann.setUri(URI);
-		return ann;
-	}
-
-	public IStatus validateValue(String value) throws AnnotationCoreException {
-		if (validator != null) {
-			return validator.validateValue(value);
-		}
-		throw new AnnotationCoreException("No validator defined for " + getID());
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BigStringAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BigStringAnnotationSpecification.java
deleted file mode 100644
index 332abba..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BigStringAnnotationSpecification.java
+++ /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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IBigStringAnnotationSpecification;
-
-public class BigStringAnnotationSpecification extends BaseAnnotationSpecification
-		implements IAnnotationSpecification, IBigStringAnnotationSpecification {
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BooleanAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BooleanAnnotationSpecification.java
deleted file mode 100644
index 9069d5a..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/BooleanAnnotationSpecification.java
+++ /dev/null
@@ -1,27 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IBooleanAnnotationSpecification;
-
-public class BooleanAnnotationSpecification extends BaseAnnotationSpecification
-		implements IAnnotationSpecification, IBooleanAnnotationSpecification {
-
-	@Override
-	void populate(IConfigurationElement element, IAnnotationForm parentForm) {
-		super.populate(element, parentForm);
-
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/DefaultAnnotationStoreFactory.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/DefaultAnnotationStoreFactory.java
deleted file mode 100644
index 99879f1..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/DefaultAnnotationStoreFactory.java
+++ /dev/null
@@ -1,166 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import java.io.IOException;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.eclipse.core.resources.IFile;
-import org.eclipse.core.resources.IFolder;
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.IResourceChangeEvent;
-import org.eclipse.core.resources.IResourceChangeListener;
-import org.eclipse.core.resources.ResourcesPlugin;
-import org.eclipse.core.runtime.CoreException;
-import org.eclipse.core.runtime.IAdaptable;
-import org.eclipse.core.runtime.NullProgressMonitor;
-import org.eclipse.emf.common.util.EList;
-import org.eclipse.emf.common.util.URI;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.xmi.impl.XMLResourceImpl;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationStore;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.IAnnotationStoreFactory;
-import org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextFactory;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextPackage;
-
-/**
- * 
- * 	This is a default Annotation Store factory using an EMF based persistence mechanism.
- * The storeKey is used to determine the location of the file used for storing the annotations.
- * 
- *  The store file will end-up in the FOLDER of the project corresponding to the given
- *  project.
- *  
- *  A storeCache is implemented to ensure multiple calls to the factory returns the same 
- *  instance of a store. In case, the corresponding file is removed, the cache entry is invalidated 
- *  and the store is marked as dirty.
- * 
- * @author erdillon
- * 
- */
-public class DefaultAnnotationStoreFactory implements IResourceChangeListener,
-		IAnnotationStoreFactory {
-
-	private final static String FOLDER = ".annotations";
-
-	private Map<IFile, EMFAnnotationStore> storeCache = new HashMap<IFile, EMFAnnotationStore>();
-
-	public DefaultAnnotationStoreFactory() {
-		registerForResourceChanges();
-	}
-
-	public AnnotationStore getAnnotationStore(Object storeKey,
-			IAnnotationScheme scheme) throws AnnotationCoreException {
-
-		XMLResourceImpl res = null;
-		EMFAnnotationStore store = null;
-		IFile storeFile = resolveFile(storeKey, scheme);
-
-		// is it already in the cache?
-		if (storeCache.containsKey(storeFile)) {
-			return storeCache.get(storeFile);
-		}
-
-		res = new XMLResourceImpl(URI.createPlatformResourceURI(storeFile
-				.getFullPath().toOSString(), false));
-
-		if (storeFile.exists()) {
-			try {
-				res.load(null);
-
-				store = new EMFAnnotationStore(res, scheme);
-			} catch (IOException e) {
-				throw new AnnotationCoreException(
-						"Error while trying to load existing annotation store file: "
-								+ e.getMessage(), e);
-			}
-		} else {
-			try {
-				EList<EObject> contents = res.getContents();
-				AnnotationContext context = ContextFactory.eINSTANCE
-						.createAnnotationContext();
-				context.setNamespaceID(scheme.getNamespaceID());
-				contents.add(context);
-				res.save(null);
-				store = new EMFAnnotationStore(res, scheme);
-			} catch (IOException e) {
-				throw new AnnotationCoreException(e);
-			}
-		}
-
-		storeCache.put(storeFile, store);
-		return store;
-	}
-
-	public AnnotationStore[] getAnnotationStores(Object storeKey)
-			throws AnnotationCoreException {
-		// TODO not implemented
-		return new AnnotationStore[0];
-	}
-
-	/**
-	 * Returns the file corresponding to the store for the given key/scheme
-	 * combo
-	 * 
-	 * @param storeKey
-	 * @param scheme
-	 * @return
-	 * @throws AnnotationCoreException
-	 */
-	private IFile resolveFile(Object storeKey, IAnnotationScheme scheme)
-			throws AnnotationCoreException {
-		if (storeKey instanceof IAdaptable) {
-			IAdaptable adaptable = (IAdaptable) storeKey;
-			IProject project = (IProject) adaptable.getAdapter(IProject.class);
-			if (project != null) {
-				IFolder folder = project.getFolder(FOLDER);
-				if (!folder.exists()) {
-					try {
-						folder.create(true, true, new NullProgressMonitor());
-					} catch (CoreException e) {
-						throw new AnnotationCoreException("Can't create "
-								+ FOLDER + " directory: " + e.getMessage(), e);
-					}
-				}
-
-				IFile file = folder.getFile(scheme.getNamespaceID() + "."
-						+ ContextPackage.eNS_PREFIX);
-				return file;
-			}
-		}
-		throw new AnnotationCoreException("Can't resolve store file for "
-				+ storeKey + " / " + scheme.getNamespaceID());
-	}
-
-	// ========= Resource Change Listener
-
-	public void resourceChanged(IResourceChangeEvent event) {
-		// TODO
-	}
-
-	/**
-	 * Registers this for changes on resources. The idea is that since each
-	 * AnnotationStore is actually a file, we want to be notified when the store
-	 * disappears or gets modified outside of this context.
-	 * 
-	 */
-	private void registerForResourceChanges() {
-		ResourcesPlugin.getWorkspace().addResourceChangeListener(
-				this,
-				IResourceChangeEvent.PRE_DELETE
-						| IResourceChangeEvent.POST_CHANGE
-						| IResourceChangeEvent.PRE_CLOSE);
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/EMFAnnotationStore.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/EMFAnnotationStore.java
deleted file mode 100644
index 0860289..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/EMFAnnotationStore.java
+++ /dev/null
@@ -1,170 +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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import java.io.IOException;
-
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.tigerstripe.annotations.AnnotationCoreException;
-import org.eclipse.tigerstripe.annotations.AnnotationStore;
-import org.eclipse.tigerstripe.annotations.IAnnotationScheme;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.internal.context.Annotation;
-import org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextFactory;
-
-/**
- * This is the default implementation for Annotation Store. It is based on EMF
- * Resource
- * 
- * @author erdillon
- * 
- */
-public class EMFAnnotationStore extends AnnotationStore {
-
-	private Resource resource;
-	private IAnnotationScheme scheme;
-	private boolean isDirty = false;
-
-	public EMFAnnotationStore(Resource resource, IAnnotationScheme scheme) {
-		this.resource = resource;
-		this.scheme = scheme;
-	}
-
-	protected IAnnotationScheme getScheme() {
-		return this.scheme;
-	}
-
-	private AnnotationContext getAnnotationContext()
-			throws AnnotationCoreException {
-		EObject obj = resource.getContents().get(0);
-		if (obj instanceof AnnotationContext) {
-			return (AnnotationContext) obj;
-		}
-		throw new AnnotationCoreException();
-	}
-
-	@Override
-	public void load() throws AnnotationCoreException {
-		try {
-			resource.load(null);
-			setDirty(false);
-		} catch (IOException e) {
-			throw new AnnotationCoreException(e);
-		}
-	}
-
-	@Override
-	public void store() throws AnnotationCoreException {
-		try {
-			resource.save(null);
-			setDirty(false);
-		} catch (IOException e) {
-			throw new AnnotationCoreException(e);
-		}
-	}
-
-	public boolean isDirty() throws AnnotationCoreException {
-		return isDirty;
-	}
-
-	protected void setDirty(boolean isDirty) {
-		this.isDirty = isDirty;
-	}
-
-	@Override
-	public void setAnnotation(IAnnotationSpecification specification,
-			String URI, Object value) throws AnnotationCoreException {
-
-		Annotation targetAnnotation = null;
-
-		// TODO use a query to do this
-		// look for an existing value
-		for (Annotation ann : getAnnotationContext().getAnnotations()) {
-			if (ann.getAnnotationSpecificationID()
-					.equals(specification.getID())
-					&& ann.getUri().equals(URI)) {
-				targetAnnotation = ann;
-			}
-		}
-
-		if (targetAnnotation == null) {
-			targetAnnotation = ContextFactory.eINSTANCE.createAnnotation();
-			getAnnotationContext().getAnnotations().add(targetAnnotation);
-		}
-
-		targetAnnotation.setAnnotationSpecificationID(specification.getID());
-		targetAnnotation.setUri(URI);
-		targetAnnotation.setValue(value);
-
-		setDirty(true);
-	}
-
-	@Override
-	public void unsetAnnotation(IAnnotationSpecification specification,
-			String URI) throws AnnotationCoreException {
-		// TODO Auto-generated method stub
-
-	}
-
-	@Override
-	public Object getAnnotation(IAnnotationSpecification specification,
-			String URI) throws AnnotationCoreException {
-		// TODO use a query to implement
-		for (Annotation ann : getAnnotationContext().getAnnotations()) {
-			if (ann.getAnnotationSpecificationID()
-					.equals(specification.getID())
-					&& ann.getUri().equals(URI)) {
-				return ann.getValue();
-			}
-		}
-		return null;
-	}
-
-	@Override
-	public void uriChanged(String oldURI, String newURI)
-			throws AnnotationCoreException {
-		for (Annotation ann : getAnnotationContext().getAnnotations()) {
-			if (ann.getUri().equals(oldURI)) {
-				ann.setUri(newURI);
-				setDirty(true);
-			}
-		}
-
-		if (isDirty())
-			store();
-	}
-
-	@Override
-	public void uriRemoved(String URI) throws AnnotationCoreException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/**
-	 * This callback is used when the factory detects that the underlying store
-	 * file was removed In this case, the store is marked as dirty.
-	 * 
-	 */
-	public void storeFileDeleted() {
-		// TODO
-	}
-
-	/**
-	 * This callback is used when the factory detects that the underlying store
-	 * file was changed In this case, the store needs to be reloaded.
-	 * 
-	 */
-	public void storeFileChanged() {
-		// TODO
-	}
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/EnumerationAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/EnumerationAnnotationSpecification.java
deleted file mode 100644
index 5e82015..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/EnumerationAnnotationSpecification.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.annotations.internal;
-
-import java.util.HashSet;
-import java.util.Set;
-
-import org.eclipse.core.runtime.IConfigurationElement;
-import org.eclipse.tigerstripe.annotations.IAnnotationForm;
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IEnumerationAnnotationSpecification;
-
-public class EnumerationAnnotationSpecification extends
-		BaseAnnotationSpecification implements IAnnotationSpecification,
-		IEnumerationAnnotationSpecification {
-
-	private Set<AnnotationSpecificationLiteral> literals = new HashSet<AnnotationSpecificationLiteral>();
-
-	public void addLiteral(AnnotationSpecificationLiteral literal) {
-		literals.add(literal);
-	}
-
-	public AnnotationSpecificationLiteral[] getLiterals() {
-		return literals.toArray(new AnnotationSpecificationLiteral[literals
-				.size()]);
-	}
-
-	@Override
-	void populate(IConfigurationElement element, IAnnotationForm parentForm) {
-		super.populate(element, parentForm);
-
-		// parse the Literals
-		AnnotationSpecificationLiteral literal;
-		for (IConfigurationElement child : element.getChildren("literal")) {
-			literal = new AnnotationSpecificationLiteral();
-			literal.setValue(child.getAttribute("value"));
-			literal.setIndex(Integer.parseInt(child.getAttribute("index")));
-			addLiteral(literal);
-		}
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/StringAnnotationSpecification.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/StringAnnotationSpecification.java
deleted file mode 100644
index 2e70665..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/StringAnnotationSpecification.java
+++ /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:
- *    erdillon (Cisco Systems, Inc.) - Initial version
- *******************************************************************************/
-package org.eclipse.tigerstripe.annotations.internal;
-
-import org.eclipse.tigerstripe.annotations.IAnnotationSpecification;
-import org.eclipse.tigerstripe.annotations.IStringAnnotationSpecification;
-
-public class StringAnnotationSpecification extends BaseAnnotationSpecification
-		implements IAnnotationSpecification, IStringAnnotationSpecification {
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/Annotation.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/Annotation.java
deleted file mode 100644
index 5380be5..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/Annotation.java
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: Annotation.java,v 1.1 2008/01/16 18:14:19 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Annotation</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getAnnotationSpecificationID <em>Annotation Specification ID</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getUri <em>Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotation()
- * @model
- * @generated
- */
-public interface Annotation extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Annotation Specification ID</b></em>' attribute.
-	 * The default value is <code>""</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Annotation Specification ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Annotation Specification ID</em>' attribute.
-	 * @see #setAnnotationSpecificationID(String)
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotation_AnnotationSpecificationID()
-	 * @model default="" required="true"
-	 * @generated
-	 */
-	String getAnnotationSpecificationID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getAnnotationSpecificationID <em>Annotation Specification ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Annotation Specification ID</em>' attribute.
-	 * @see #getAnnotationSpecificationID()
-	 * @generated
-	 */
-	void setAnnotationSpecificationID(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(Object)
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotation_Value()
-	 * @model
-	 * @generated
-	 */
-	Object getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(Object value);
-
-	/**
-	 * Returns the value of the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Uri</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Uri</em>' attribute.
-	 * @see #setUri(String)
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotation_Uri()
-	 * @model
-	 * @generated
-	 */
-	String getUri();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getUri <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Uri</em>' attribute.
-	 * @see #getUri()
-	 * @generated
-	 */
-	void setUri(String value);
-
-} // Annotation
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/AnnotationContext.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/AnnotationContext.java
deleted file mode 100644
index 042ad80..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/AnnotationContext.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AnnotationContext.java,v 1.1 2008/01/16 18:14:19 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>Annotation Context</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getNamespaceID <em>Namespace ID</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotationContext()
- * @model
- * @generated
- */
-public interface AnnotationContext extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Annotations</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.annotations.internal.context.Annotation}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Annotations</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Annotations</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotationContext_Annotations()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<Annotation> getAnnotations();
-
-	/**
-	 * Returns the value of the '<em><b>Namespace ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Namespace ID</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Namespace ID</em>' attribute.
-	 * @see #setNamespaceID(String)
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#getAnnotationContext_NamespaceID()
-	 * @model
-	 * @generated
-	 */
-	String getNamespaceID();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getNamespaceID <em>Namespace ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Namespace ID</em>' attribute.
-	 * @see #getNamespaceID()
-	 * @generated
-	 */
-	void setNamespaceID(String value);
-
-} // AnnotationContext
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/ContextFactory.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/ContextFactory.java
deleted file mode 100644
index 63d932b..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/ContextFactory.java
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContextFactory.java,v 1.1 2008/01/16 18:14:19 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage
- * @generated
- */
-public interface ContextFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ContextFactory eINSTANCE = org.eclipse.tigerstripe.annotations.internal.context.impl.ContextFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>Annotation Context</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Annotation Context</em>'.
-	 * @generated
-	 */
-	AnnotationContext createAnnotationContext();
-
-	/**
-	 * Returns a new object of class '<em>Annotation</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>Annotation</em>'.
-	 * @generated
-	 */
-	Annotation createAnnotation();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	ContextPackage getContextPackage();
-
-} //ContextFactory
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/ContextPackage.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/ContextPackage.java
deleted file mode 100644
index e04453d..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/ContextPackage.java
+++ /dev/null
@@ -1,305 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContextPackage.java,v 1.1 2008/01/16 18:14:19 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotations.internal.context.ContextFactory
- * @model kind="package"
- * @generated
- */
-public interface ContextPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "context";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "http://www.eclipse.org/tigerstripe/schemas/annotations";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "ann";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	ContextPackage eINSTANCE = org.eclipse.tigerstripe.annotations.internal.context.impl.ContextPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationContextImpl <em>Annotation Context</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationContextImpl
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.ContextPackageImpl#getAnnotationContext()
-	 * @generated
-	 */
-	int ANNOTATION_CONTEXT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Annotations</b></em>' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION_CONTEXT__ANNOTATIONS = 0;
-
-	/**
-	 * The feature id for the '<em><b>Namespace ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION_CONTEXT__NAMESPACE_ID = 1;
-
-	/**
-	 * The number of structural features of the '<em>Annotation Context</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION_CONTEXT_FEATURE_COUNT = 2;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl <em>Annotation</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.ContextPackageImpl#getAnnotation()
-	 * @generated
-	 */
-	int ANNOTATION = 1;
-
-	/**
-	 * The feature id for the '<em><b>Annotation Specification ID</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION__ANNOTATION_SPECIFICATION_ID = 0;
-
-	/**
-	 * The feature id for the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION__VALUE = 1;
-
-	/**
-	 * The feature id for the '<em><b>Uri</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION__URI = 2;
-
-	/**
-	 * The number of structural features of the '<em>Annotation</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ANNOTATION_FEATURE_COUNT = 3;
-
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext <em>Annotation Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Annotation Context</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext
-	 * @generated
-	 */
-	EClass getAnnotationContext();
-
-	/**
-	 * Returns the meta object for the containment reference list '{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getAnnotations <em>Annotations</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the containment reference list '<em>Annotations</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getAnnotations()
-	 * @see #getAnnotationContext()
-	 * @generated
-	 */
-	EReference getAnnotationContext_Annotations();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getNamespaceID <em>Namespace ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Namespace ID</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext#getNamespaceID()
-	 * @see #getAnnotationContext()
-	 * @generated
-	 */
-	EAttribute getAnnotationContext_NamespaceID();
-
-	/**
-	 * Returns the meta object for class '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation <em>Annotation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for class '<em>Annotation</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.Annotation
-	 * @generated
-	 */
-	EClass getAnnotation();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getAnnotationSpecificationID <em>Annotation Specification ID</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Annotation Specification ID</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.Annotation#getAnnotationSpecificationID()
-	 * @see #getAnnotation()
-	 * @generated
-	 */
-	EAttribute getAnnotation_AnnotationSpecificationID();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getValue <em>Value</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Value</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.Annotation#getValue()
-	 * @see #getAnnotation()
-	 * @generated
-	 */
-	EAttribute getAnnotation_Value();
-
-	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation#getUri <em>Uri</em>}'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the meta object for the attribute '<em>Uri</em>'.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.Annotation#getUri()
-	 * @see #getAnnotation()
-	 * @generated
-	 */
-	EAttribute getAnnotation_Uri();
-
-	/**
-	 * Returns the factory that creates the instances of the model.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the factory that creates the instances of the model.
-	 * @generated
-	 */
-	ContextFactory getContextFactory();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * Defines literals for the meta objects that represent
-	 * <ul>
-	 *   <li>each class,</li>
-	 *   <li>each feature of each class,</li>
-	 *   <li>each enum,</li>
-	 *   <li>and each data type</li>
-	 * </ul>
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	interface Literals {
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationContextImpl <em>Annotation Context</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationContextImpl
-		 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.ContextPackageImpl#getAnnotationContext()
-		 * @generated
-		 */
-		EClass ANNOTATION_CONTEXT = eINSTANCE.getAnnotationContext();
-
-		/**
-		 * The meta object literal for the '<em><b>Annotations</b></em>' containment reference list feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EReference ANNOTATION_CONTEXT__ANNOTATIONS = eINSTANCE.getAnnotationContext_Annotations();
-
-		/**
-		 * The meta object literal for the '<em><b>Namespace ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ANNOTATION_CONTEXT__NAMESPACE_ID = eINSTANCE.getAnnotationContext_NamespaceID();
-
-		/**
-		 * The meta object literal for the '{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl <em>Annotation</em>}' class.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl
-		 * @see org.eclipse.tigerstripe.annotations.internal.context.impl.ContextPackageImpl#getAnnotation()
-		 * @generated
-		 */
-		EClass ANNOTATION = eINSTANCE.getAnnotation();
-
-		/**
-		 * The meta object literal for the '<em><b>Annotation Specification ID</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ANNOTATION__ANNOTATION_SPECIFICATION_ID = eINSTANCE.getAnnotation_AnnotationSpecificationID();
-
-		/**
-		 * The meta object literal for the '<em><b>Value</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ANNOTATION__VALUE = eINSTANCE.getAnnotation_Value();
-
-		/**
-		 * The meta object literal for the '<em><b>Uri</b></em>' attribute feature.
-		 * <!-- begin-user-doc -->
-		 * <!-- end-user-doc -->
-		 * @generated
-		 */
-		EAttribute ANNOTATION__URI = eINSTANCE.getAnnotation_Uri();
-
-	}
-
-} //ContextPackage
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/AnnotationContextImpl.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/AnnotationContextImpl.java
deleted file mode 100644
index 657fee9..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/AnnotationContextImpl.java
+++ /dev/null
@@ -1,226 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AnnotationContextImpl.java,v 1.1 2008/01/16 18:14:18 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context.impl;
-
-import java.util.Collection;
-
-import org.eclipse.emf.common.notify.Notification;
-import org.eclipse.emf.common.notify.NotificationChain;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.InternalEObject;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.emf.ecore.util.EObjectContainmentEList;
-import org.eclipse.emf.ecore.util.InternalEList;
-
-import org.eclipse.tigerstripe.annotations.internal.context.Annotation;
-import org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Annotation Context</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationContextImpl#getAnnotations <em>Annotations</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationContextImpl#getNamespaceID <em>Namespace ID</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AnnotationContextImpl extends EObjectImpl implements AnnotationContext {
-	/**
-	 * The cached value of the '{@link #getAnnotations() <em>Annotations</em>}' containment reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAnnotations()
-	 * @generated
-	 * @ordered
-	 */
-	protected EList<Annotation> annotations;
-
-	/**
-	 * The default value of the '{@link #getNamespaceID() <em>Namespace ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespaceID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String NAMESPACE_ID_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getNamespaceID() <em>Namespace ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getNamespaceID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String namespaceID = NAMESPACE_ID_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AnnotationContextImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ContextPackage.Literals.ANNOTATION_CONTEXT;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EList<Annotation> getAnnotations() {
-		if (annotations == null) {
-			annotations = new EObjectContainmentEList<Annotation>(Annotation.class, this, ContextPackage.ANNOTATION_CONTEXT__ANNOTATIONS);
-		}
-		return annotations;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getNamespaceID() {
-		return namespaceID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setNamespaceID(String newNamespaceID) {
-		String oldNamespaceID = namespaceID;
-		namespaceID = newNamespaceID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ContextPackage.ANNOTATION_CONTEXT__NAMESPACE_ID, oldNamespaceID, namespaceID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public NotificationChain eInverseRemove(InternalEObject otherEnd, int featureID, NotificationChain msgs) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION_CONTEXT__ANNOTATIONS:
-				return ((InternalEList<?>)getAnnotations()).basicRemove(otherEnd, msgs);
-		}
-		return super.eInverseRemove(otherEnd, featureID, msgs);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION_CONTEXT__ANNOTATIONS:
-				return getAnnotations();
-			case ContextPackage.ANNOTATION_CONTEXT__NAMESPACE_ID:
-				return getNamespaceID();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@SuppressWarnings("unchecked")
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION_CONTEXT__ANNOTATIONS:
-				getAnnotations().clear();
-				getAnnotations().addAll((Collection<? extends Annotation>)newValue);
-				return;
-			case ContextPackage.ANNOTATION_CONTEXT__NAMESPACE_ID:
-				setNamespaceID((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION_CONTEXT__ANNOTATIONS:
-				getAnnotations().clear();
-				return;
-			case ContextPackage.ANNOTATION_CONTEXT__NAMESPACE_ID:
-				setNamespaceID(NAMESPACE_ID_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION_CONTEXT__ANNOTATIONS:
-				return annotations != null && !annotations.isEmpty();
-			case ContextPackage.ANNOTATION_CONTEXT__NAMESPACE_ID:
-				return NAMESPACE_ID_EDEFAULT == null ? namespaceID != null : !NAMESPACE_ID_EDEFAULT.equals(namespaceID);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (namespaceID: ");
-		result.append(namespaceID);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AnnotationContextImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/AnnotationImpl.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/AnnotationImpl.java
deleted file mode 100644
index 27d5615..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/AnnotationImpl.java
+++ /dev/null
@@ -1,275 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: AnnotationImpl.java,v 1.1 2008/01/16 18:14:18 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context.impl;
-
-import org.eclipse.emf.common.notify.Notification;
-
-import org.eclipse.emf.ecore.EClass;
-
-import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.emf.ecore.impl.EObjectImpl;
-
-import org.eclipse.tigerstripe.annotations.internal.context.Annotation;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model object '<em><b>Annotation</b></em>'.
- * <!-- end-user-doc -->
- * <p>
- * The following features are implemented:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl#getAnnotationSpecificationID <em>Annotation Specification ID</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.annotations.internal.context.impl.AnnotationImpl#getUri <em>Uri</em>}</li>
- * </ul>
- * </p>
- *
- * @generated
- */
-public class AnnotationImpl extends EObjectImpl implements Annotation {
-	/**
-	 * The default value of the '{@link #getAnnotationSpecificationID() <em>Annotation Specification ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAnnotationSpecificationID()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String ANNOTATION_SPECIFICATION_ID_EDEFAULT = "";
-
-	/**
-	 * The cached value of the '{@link #getAnnotationSpecificationID() <em>Annotation Specification ID</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getAnnotationSpecificationID()
-	 * @generated
-	 * @ordered
-	 */
-	protected String annotationSpecificationID = ANNOTATION_SPECIFICATION_ID_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final Object VALUE_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getValue() <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getValue()
-	 * @generated
-	 * @ordered
-	 */
-	protected Object value = VALUE_EDEFAULT;
-
-	/**
-	 * The default value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected static final String URI_EDEFAULT = null;
-
-	/**
-	 * The cached value of the '{@link #getUri() <em>Uri</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #getUri()
-	 * @generated
-	 * @ordered
-	 */
-	protected String uri = URI_EDEFAULT;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected AnnotationImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	protected EClass eStaticClass() {
-		return ContextPackage.Literals.ANNOTATION;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getAnnotationSpecificationID() {
-		return annotationSpecificationID;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setAnnotationSpecificationID(String newAnnotationSpecificationID) {
-		String oldAnnotationSpecificationID = annotationSpecificationID;
-		annotationSpecificationID = newAnnotationSpecificationID;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ContextPackage.ANNOTATION__ANNOTATION_SPECIFICATION_ID, oldAnnotationSpecificationID, annotationSpecificationID));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Object getValue() {
-		return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setValue(Object newValue) {
-		Object oldValue = value;
-		value = newValue;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ContextPackage.ANNOTATION__VALUE, oldValue, value));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getUri() {
-		return uri;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void setUri(String newUri) {
-		String oldUri = uri;
-		uri = newUri;
-		if (eNotificationRequired())
-			eNotify(new ENotificationImpl(this, Notification.SET, ContextPackage.ANNOTATION__URI, oldUri, uri));
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public Object eGet(int featureID, boolean resolve, boolean coreType) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION__ANNOTATION_SPECIFICATION_ID:
-				return getAnnotationSpecificationID();
-			case ContextPackage.ANNOTATION__VALUE:
-				return getValue();
-			case ContextPackage.ANNOTATION__URI:
-				return getUri();
-		}
-		return super.eGet(featureID, resolve, coreType);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eSet(int featureID, Object newValue) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION__ANNOTATION_SPECIFICATION_ID:
-				setAnnotationSpecificationID((String)newValue);
-				return;
-			case ContextPackage.ANNOTATION__VALUE:
-				setValue(newValue);
-				return;
-			case ContextPackage.ANNOTATION__URI:
-				setUri((String)newValue);
-				return;
-		}
-		super.eSet(featureID, newValue);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public void eUnset(int featureID) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION__ANNOTATION_SPECIFICATION_ID:
-				setAnnotationSpecificationID(ANNOTATION_SPECIFICATION_ID_EDEFAULT);
-				return;
-			case ContextPackage.ANNOTATION__VALUE:
-				setValue(VALUE_EDEFAULT);
-				return;
-			case ContextPackage.ANNOTATION__URI:
-				setUri(URI_EDEFAULT);
-				return;
-		}
-		super.eUnset(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public boolean eIsSet(int featureID) {
-		switch (featureID) {
-			case ContextPackage.ANNOTATION__ANNOTATION_SPECIFICATION_ID:
-				return ANNOTATION_SPECIFICATION_ID_EDEFAULT == null ? annotationSpecificationID != null : !ANNOTATION_SPECIFICATION_ID_EDEFAULT.equals(annotationSpecificationID);
-			case ContextPackage.ANNOTATION__VALUE:
-				return VALUE_EDEFAULT == null ? value != null : !VALUE_EDEFAULT.equals(value);
-			case ContextPackage.ANNOTATION__URI:
-				return URI_EDEFAULT == null ? uri != null : !URI_EDEFAULT.equals(uri);
-		}
-		return super.eIsSet(featureID);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		if (eIsProxy()) return super.toString();
-
-		StringBuffer result = new StringBuffer(super.toString());
-		result.append(" (annotationSpecificationID: ");
-		result.append(annotationSpecificationID);
-		result.append(", value: ");
-		result.append(value);
-		result.append(", uri: ");
-		result.append(uri);
-		result.append(')');
-		return result.toString();
-	}
-
-} //AnnotationImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/ContextFactoryImpl.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/ContextFactoryImpl.java
deleted file mode 100644
index 14bba4c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/ContextFactoryImpl.java
+++ /dev/null
@@ -1,110 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContextFactoryImpl.java,v 1.1 2008/01/16 18:14:18 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context.impl;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-import org.eclipse.emf.ecore.EPackage;
-
-import org.eclipse.emf.ecore.impl.EFactoryImpl;
-
-import org.eclipse.emf.ecore.plugin.EcorePlugin;
-
-import org.eclipse.tigerstripe.annotations.internal.context.*;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Factory</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContextFactoryImpl extends EFactoryImpl implements ContextFactory {
-	/**
-	 * Creates the default factory implementation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ContextFactory init() {
-		try {
-			ContextFactory theContextFactory = (ContextFactory)EPackage.Registry.INSTANCE.getEFactory("http://www.eclipse.org/tigerstripe/schemas/annotations"); 
-			if (theContextFactory != null) {
-				return theContextFactory;
-			}
-		}
-		catch (Exception exception) {
-			EcorePlugin.INSTANCE.log(exception);
-		}
-		return new ContextFactoryImpl();
-	}
-
-	/**
-	 * Creates an instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextFactoryImpl() {
-		super();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public EObject create(EClass eClass) {
-		switch (eClass.getClassifierID()) {
-			case ContextPackage.ANNOTATION_CONTEXT: return createAnnotationContext();
-			case ContextPackage.ANNOTATION: return createAnnotation();
-			default:
-				throw new IllegalArgumentException("The class '" + eClass.getName() + "' is not a valid classifier");
-		}
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public AnnotationContext createAnnotationContext() {
-		AnnotationContextImpl annotationContext = new AnnotationContextImpl();
-		return annotationContext;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public Annotation createAnnotation() {
-		AnnotationImpl annotation = new AnnotationImpl();
-		return annotation;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextPackage getContextPackage() {
-		return (ContextPackage)getEPackage();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @deprecated
-	 * @generated
-	 */
-	@Deprecated
-	public static ContextPackage getPackage() {
-		return ContextPackage.eINSTANCE;
-	}
-
-} //ContextFactoryImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/ContextPackageImpl.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/ContextPackageImpl.java
deleted file mode 100644
index dc9d72c..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/impl/ContextPackageImpl.java
+++ /dev/null
@@ -1,254 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContextPackageImpl.java,v 1.1 2008/01/16 18:14:18 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context.impl;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-import org.eclipse.emf.ecore.impl.EPackageImpl;
-
-import org.eclipse.tigerstripe.annotations.internal.context.Annotation;
-import org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextFactory;
-import org.eclipse.tigerstripe.annotations.internal.context.ContextPackage;
-
-/**
- * <!-- begin-user-doc -->
- * An implementation of the model <b>Package</b>.
- * <!-- end-user-doc -->
- * @generated
- */
-public class ContextPackageImpl extends EPackageImpl implements ContextPackage {
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass annotationContextEClass = null;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EClass annotationEClass = null;
-
-	/**
-	 * Creates an instance of the model <b>Package</b>, registered with
-	 * {@link org.eclipse.emf.ecore.EPackage.Registry EPackage.Registry} by the package
-	 * package URI value.
-	 * <p>Note: the correct way to create the package is via the static
-	 * factory method {@link #init init()}, which also performs
-	 * initialization of the package, or returns the registered package,
-	 * if one already exists.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage#eNS_URI
-	 * @see #init()
-	 * @generated
-	 */
-	private ContextPackageImpl() {
-		super(eNS_URI, ContextFactory.eINSTANCE);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static boolean isInited = false;
-
-	/**
-	 * Creates, registers, and initializes the <b>Package</b> for this
-	 * model, and for any others upon which it depends.  Simple
-	 * dependencies are satisfied by calling this method on all
-	 * dependent packages before doing anything else.  This method drives
-	 * initialization for interdependent packages directly, in parallel
-	 * with this package, itself.
-	 * <p>Of this package and its interdependencies, all packages which
-	 * have not yet been registered by their URI values are first created
-	 * and registered.  The packages are then initialized in two steps:
-	 * meta-model objects for all of the packages are created before any
-	 * are initialized, since one package's meta-model objects may refer to
-	 * those of another.
-	 * <p>Invocation of this method will not affect any packages that have
-	 * already been initialized.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #eNS_URI
-	 * @see #createPackageContents()
-	 * @see #initializePackageContents()
-	 * @generated
-	 */
-	public static ContextPackage init() {
-		if (isInited) return (ContextPackage)EPackage.Registry.INSTANCE.getEPackage(ContextPackage.eNS_URI);
-
-		// Obtain or create and register package
-		ContextPackageImpl theContextPackage = (ContextPackageImpl)(EPackage.Registry.INSTANCE.getEPackage(eNS_URI) instanceof ContextPackageImpl ? EPackage.Registry.INSTANCE.getEPackage(eNS_URI) : new ContextPackageImpl());
-
-		isInited = true;
-
-		// Create package meta-data objects
-		theContextPackage.createPackageContents();
-
-		// Initialize created meta-data
-		theContextPackage.initializePackageContents();
-
-		// Mark meta-data to indicate it can't be changed
-		theContextPackage.freeze();
-
-		return theContextPackage;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAnnotationContext() {
-		return annotationContextEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EReference getAnnotationContext_Annotations() {
-		return (EReference)annotationContextEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnnotationContext_NamespaceID() {
-		return (EAttribute)annotationContextEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EClass getAnnotation() {
-		return annotationEClass;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnnotation_AnnotationSpecificationID() {
-		return (EAttribute)annotationEClass.getEStructuralFeatures().get(0);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnnotation_Value() {
-		return (EAttribute)annotationEClass.getEStructuralFeatures().get(1);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public EAttribute getAnnotation_Uri() {
-		return (EAttribute)annotationEClass.getEStructuralFeatures().get(2);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextFactory getContextFactory() {
-		return (ContextFactory)getEFactoryInstance();
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isCreated = false;
-
-	/**
-	 * Creates the meta-model objects for the package.  This method is
-	 * guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void createPackageContents() {
-		if (isCreated) return;
-		isCreated = true;
-
-		// Create classes and their features
-		annotationContextEClass = createEClass(ANNOTATION_CONTEXT);
-		createEReference(annotationContextEClass, ANNOTATION_CONTEXT__ANNOTATIONS);
-		createEAttribute(annotationContextEClass, ANNOTATION_CONTEXT__NAMESPACE_ID);
-
-		annotationEClass = createEClass(ANNOTATION);
-		createEAttribute(annotationEClass, ANNOTATION__ANNOTATION_SPECIFICATION_ID);
-		createEAttribute(annotationEClass, ANNOTATION__VALUE);
-		createEAttribute(annotationEClass, ANNOTATION__URI);
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private boolean isInitialized = false;
-
-	/**
-	 * Complete the initialization of the package and its meta-model.  This
-	 * method is guarded to have no affect on any invocation but its first.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public void initializePackageContents() {
-		if (isInitialized) return;
-		isInitialized = true;
-
-		// Initialize package
-		setName(eNAME);
-		setNsPrefix(eNS_PREFIX);
-		setNsURI(eNS_URI);
-
-		// Create type parameters
-
-		// Set bounds for type parameters
-
-		// Add supertypes to classes
-
-		// Initialize classes and features; add operations and parameters
-		initEClass(annotationContextEClass, AnnotationContext.class, "AnnotationContext", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEReference(getAnnotationContext_Annotations(), this.getAnnotation(), null, "annotations", null, 0, -1, AnnotationContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, IS_COMPOSITE, !IS_RESOLVE_PROXIES, !IS_UNSETTABLE, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnnotationContext_NamespaceID(), ecorePackage.getEString(), "namespaceID", null, 0, 1, AnnotationContext.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		initEClass(annotationEClass, Annotation.class, "Annotation", !IS_ABSTRACT, !IS_INTERFACE, IS_GENERATED_INSTANCE_CLASS);
-		initEAttribute(getAnnotation_AnnotationSpecificationID(), ecorePackage.getEString(), "annotationSpecificationID", "", 1, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnnotation_Value(), ecorePackage.getEJavaObject(), "value", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-		initEAttribute(getAnnotation_Uri(), ecorePackage.getEString(), "uri", null, 0, 1, Annotation.class, !IS_TRANSIENT, !IS_VOLATILE, IS_CHANGEABLE, !IS_UNSETTABLE, !IS_ID, IS_UNIQUE, !IS_DERIVED, IS_ORDERED);
-
-		// Create resource
-		createResource(eNS_URI);
-	}
-
-} //ContextPackageImpl
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/util/ContextAdapterFactory.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/util/ContextAdapterFactory.java
deleted file mode 100644
index 0c7b354..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/util/ContextAdapterFactory.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContextAdapterFactory.java,v 1.1 2008/01/16 18:14:19 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context.util;
-
-import org.eclipse.emf.common.notify.Adapter;
-import org.eclipse.emf.common.notify.Notifier;
-
-import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.annotations.internal.context.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Adapter Factory</b> for the model.
- * It provides an adapter <code>createXXX</code> method for each class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage
- * @generated
- */
-public class ContextAdapterFactory extends AdapterFactoryImpl {
-	/**
-	 * The cached model package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ContextPackage modelPackage;
-
-	/**
-	 * Creates an instance of the adapter factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextAdapterFactory() {
-		if (modelPackage == null) {
-			modelPackage = ContextPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Returns whether this factory is applicable for the type of the object.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns <code>true</code> if the object is either the model's package or is an instance object of the model.
-	 * <!-- end-user-doc -->
-	 * @return whether this factory is applicable for the type of the object.
-	 * @generated
-	 */
-	@Override
-	public boolean isFactoryForType(Object object) {
-		if (object == modelPackage) {
-			return true;
-		}
-		if (object instanceof EObject) {
-			return ((EObject)object).eClass().getEPackage() == modelPackage;
-		}
-		return false;
-	}
-
-	/**
-	 * The switch the delegates to the <code>createXXX</code> methods.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected ContextSwitch<Adapter> modelSwitch =
-		new ContextSwitch<Adapter>() {
-			@Override
-			public Adapter caseAnnotationContext(AnnotationContext object) {
-				return createAnnotationContextAdapter();
-			}
-			@Override
-			public Adapter caseAnnotation(Annotation object) {
-				return createAnnotationAdapter();
-			}
-			@Override
-			public Adapter defaultCase(EObject object) {
-				return createEObjectAdapter();
-			}
-		};
-
-	/**
-	 * Creates an adapter for the <code>target</code>.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param target the object to adapt.
-	 * @return the adapter for the <code>target</code>.
-	 * @generated
-	 */
-	@Override
-	public Adapter createAdapter(Notifier target) {
-		return modelSwitch.doSwitch((EObject)target);
-	}
-
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext <em>Annotation Context</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.AnnotationContext
-	 * @generated
-	 */
-	public Adapter createAnnotationContextAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.tigerstripe.annotations.internal.context.Annotation <em>Annotation</em>}'.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null so that we can easily ignore cases;
-	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @see org.eclipse.tigerstripe.annotations.internal.context.Annotation
-	 * @generated
-	 */
-	public Adapter createAnnotationAdapter() {
-		return null;
-	}
-
-	/**
-	 * Creates a new adapter for the default case.
-	 * <!-- begin-user-doc -->
-	 * This default implementation returns null.
-	 * <!-- end-user-doc -->
-	 * @return the new adapter.
-	 * @generated
-	 */
-	public Adapter createEObjectAdapter() {
-		return null;
-	}
-
-} //ContextAdapterFactory
diff --git a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/util/ContextSwitch.java b/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/util/ContextSwitch.java
deleted file mode 100644
index bf0762f..0000000
--- a/plugins/org.eclipse.tigerstripe.annotations/src/org/eclipse/tigerstripe/annotations/internal/context/util/ContextSwitch.java
+++ /dev/null
@@ -1,151 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ContextSwitch.java,v 1.1 2008/01/16 18:14:19 edillon Exp $
- */
-package org.eclipse.tigerstripe.annotations.internal.context.util;
-
-import java.util.List;
-
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.annotations.internal.context.*;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Switch</b> for the model's inheritance hierarchy.
- * It supports the call {@link #doSwitch(EObject) doSwitch(object)}
- * to invoke the <code>caseXXX</code> method for each class of the model,
- * starting with the actual class of the object
- * and proceeding up the inheritance hierarchy
- * until a non-null result is returned,
- * which is the result of the switch.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.annotations.internal.context.ContextPackage
- * @generated
- */
-public class ContextSwitch<T> {
-	/**
-	 * The cached model package
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	protected static ContextPackage modelPackage;
-
-	/**
-	 * Creates an instance of the switch.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public ContextSwitch() {
-		if (modelPackage == null) {
-			modelPackage = ContextPackage.eINSTANCE;
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	public T doSwitch(EObject theEObject) {
-		return doSwitch(theEObject.eClass(), theEObject);
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(EClass theEClass, EObject theEObject) {
-		if (theEClass.eContainer() == modelPackage) {
-			return doSwitch(theEClass.getClassifierID(), theEObject);
-		}
-		else {
-			List<EClass> eSuperTypes = theEClass.getESuperTypes();
-			return
-				eSuperTypes.isEmpty() ?
-					defaultCase(theEObject) :
-					doSwitch(eSuperTypes.get(0), theEObject);
-		}
-	}
-
-	/**
-	 * Calls <code>caseXXX</code> for each class of the model until one returns a non null result; it yields that result.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the first non-null result returned by a <code>caseXXX</code> call.
-	 * @generated
-	 */
-	protected T doSwitch(int classifierID, EObject theEObject) {
-		switch (classifierID) {
-			case ContextPackage.ANNOTATION_CONTEXT: {
-				AnnotationContext annotationContext = (AnnotationContext)theEObject;
-				T result = caseAnnotationContext(annotationContext);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			case ContextPackage.ANNOTATION: {
-				Annotation annotation = (Annotation)theEObject;
-				T result = caseAnnotation(annotation);
-				if (result == null) result = defaultCase(theEObject);
-				return result;
-			}
-			default: return defaultCase(theEObject);
-		}
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Annotation Context</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Annotation Context</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAnnotationContext(AnnotationContext object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>Annotation</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>Annotation</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject) doSwitch(EObject)
-	 * @generated
-	 */
-	public T caseAnnotation(Annotation object) {
-		return null;
-	}
-
-	/**
-	 * Returns the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * <!-- begin-user-doc -->
-	 * This implementation returns null;
-	 * returning a non-null result will terminate the switch, but this is the last case anyway.
-	 * <!-- end-user-doc -->
-	 * @param object the target of the switch.
-	 * @return the result of interpreting the object as an instance of '<em>EObject</em>'.
-	 * @see #doSwitch(org.eclipse.emf.ecore.EObject)
-	 * @generated
-	 */
-	public T defaultCase(EObject object) {
-		return null;
-	}
-
-} //ContextSwitch
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/.classpath b/plugins/org.eclipse.tigerstripe.metamodel/.classpath
deleted file mode 100644
index 065ac06..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/.classpath
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/.project b/plugins/org.eclipse.tigerstripe.metamodel/.project
deleted file mode 100644
index fdae62f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.tigerstripe.metamodel</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-		<nature>org.eclipse.pde.PluginNature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/META-INF/MANIFEST.MF b/plugins/org.eclipse.tigerstripe.metamodel/META-INF/MANIFEST.MF
deleted file mode 100644
index 3b45e18..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,16 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.tigerstripe.metamodel;singleton:=true
-Bundle-Version: 0.3.0.qualifier
-Bundle-ClassPath: .
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.core.runtime,
- org.eclipse.emf.ecore;visibility:=reexport
-Eclipse-LazyStart: true
-Export-Package: org.eclipse.tigerstripe.metamodel,
- org.eclipse.tigerstripe.metamodel.impl,
- org.eclipse.tigerstripe.metamodel.internal,
- org.eclipse.tigerstripe.metamodel.util
-Bundle-Activator: org.eclipse.tigerstripe.metamodel.Activator
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/build.properties b/plugins/org.eclipse.tigerstripe.metamodel/build.properties
deleted file mode 100644
index 6bd6e5f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/build.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: build.properties,v 1.2 2008/02/22 20:01:22 edillon Exp $
-
-bin.includes = .,\
-               model/,\
-               META-INF/,\
-               plugin.xml,\
-               plugin.properties,\
-               icons/
-jars.compile.order = .
-source.. = src/
-output.. = bin/
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small.png b/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small.png
deleted file mode 100644
index 11e3965..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small_gs.png b/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small_gs.png
deleted file mode 100644
index e9fb1af..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small_gs.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small_new.png b/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small_new.png
deleted file mode 100644
index a566c5d..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/AssociationIcon-small_new.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small.png b/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small.png
deleted file mode 100644
index 3ecd0b4..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small_gs.png b/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small_gs.png
deleted file mode 100644
index c149854..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small_gs.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small_new.png b/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small_new.png
deleted file mode 100644
index 264f06f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/DependencyIcon-small_new.png
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/artifact_plain.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/artifact_plain.gif
deleted file mode 100644
index 125b456..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/artifact_plain.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/artifact_plain.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/artifact_plain.ico
deleted file mode 100644
index 1fd35b3..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/artifact_plain.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/association.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/association.gif
deleted file mode 100644
index 5639fe8..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/association.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/association.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/association.ico
deleted file mode 100644
index 78c8980..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/association.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass.gif
deleted file mode 100644
index e886225..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass_gs.gif
deleted file mode 100644
index 72463cc..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass_new.gif
deleted file mode 100644
index faf85a3..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/associationClass_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/association_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/association_gs.gif
deleted file mode 100644
index ba4c08f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/association_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/association_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/association_new.gif
deleted file mode 100644
index 2844624..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/association_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype.gif
deleted file mode 100644
index 1a35c16..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype_gs.gif
deleted file mode 100644
index f3f7d7d..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype_new.gif
deleted file mode 100644
index 14338b4..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/datatype_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency.gif
deleted file mode 100644
index a589355..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency.ico
deleted file mode 100644
index 1fb8f7a..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency_gs.gif
deleted file mode 100644
index 011a2e1..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency_new.gif
deleted file mode 100644
index a18683f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/dependency_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/entity.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/entity.gif
deleted file mode 100644
index 0bb3730..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/entity.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/entity_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/entity_gs.gif
deleted file mode 100644
index c54e2e6..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/entity_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/entity_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/entity_new.gif
deleted file mode 100644
index 4aa9ad7..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/entity_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/enum.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/enum.gif
deleted file mode 100644
index f50f75e..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/enum.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/enum_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/enum_gs.gif
deleted file mode 100644
index 2d093eb..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/enum_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/enum_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/enum_new.gif
deleted file mode 100644
index a6a2f21..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/enum_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/event.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/event.gif
deleted file mode 100644
index 818c8da..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/event.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/event_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/event_gs.gif
deleted file mode 100644
index add6b97..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/event_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/event_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/event_new.gif
deleted file mode 100644
index ea564a0..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/event_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/exception.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/exception.gif
deleted file mode 100644
index dc03f02..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/exception.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/exception_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/exception_gs.gif
deleted file mode 100644
index eed841f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/exception_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/exception_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/exception_new.gif
deleted file mode 100644
index 8b70f98..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/exception_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/field.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/field.gif
deleted file mode 100644
index a0bb5d5..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/field.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/field_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/field_gs.gif
deleted file mode 100644
index 4998f23..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/field_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/icon-base.mix b/plugins/org.eclipse.tigerstripe.metamodel/icons/icon-base.mix
deleted file mode 100644
index 73a6a9b..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/icon-base.mix
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/literal.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/literal.gif
deleted file mode 100644
index 000e0f6..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/literal.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/literal_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/literal_gs.gif
deleted file mode 100644
index 53dd300..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/literal_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/method.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/method.gif
deleted file mode 100644
index 7d24707..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/method.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/method_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/method_gs.gif
deleted file mode 100644
index a6285a2..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/method_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/new_artifact_plain.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/new_artifact_plain.ico
deleted file mode 100644
index dca582f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/new_artifact_plain.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/new_associationClass.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/new_associationClass.ico
deleted file mode 100644
index 52d21d8..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/new_associationClass.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/new_dependency.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/new_dependency.ico
deleted file mode 100644
index a7a12cc..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/new_dependency.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/primitive.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/primitive.gif
deleted file mode 100644
index 2a1e3ff..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/primitive.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/primitive.ico b/plugins/org.eclipse.tigerstripe.metamodel/icons/primitive.ico
deleted file mode 100644
index 44ca0e6..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/primitive.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/query.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/query.gif
deleted file mode 100644
index 0c58173..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/query.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/query_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/query_gs.gif
deleted file mode 100644
index 32370b0..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/query_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/query_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/query_new.gif
deleted file mode 100644
index 35aa15f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/query_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/session.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/session.gif
deleted file mode 100644
index 65bcf25..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/session.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/session_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/session_gs.gif
deleted file mode 100644
index b7cd586..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/session_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/session_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/session_new.gif
deleted file mode 100644
index 5377204..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/session_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc.gif
deleted file mode 100644
index 5f36d37..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc_gs.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc_gs.gif
deleted file mode 100644
index be4abe9..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc_gs.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc_new.gif b/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc_new.gif
deleted file mode 100644
index 1b8ac17..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/icons/updateProc_new.gif
+++ /dev/null
Binary files differ
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/model/.cvsignore b/plugins/org.eclipse.tigerstripe.metamodel/model/.cvsignore
deleted file mode 100644
index a0cc070..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/model/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-tigerstripe.ecore_diagram
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/model/tigerstripe.ecore b/plugins/org.eclipse.tigerstripe.metamodel/model/tigerstripe.ecore
deleted file mode 100644
index 17ae341..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/model/tigerstripe.ecore
+++ /dev/null
@@ -1,343 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ecore:EPackage xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" name="metamodel"
-    nsURI="tigerstripe" nsPrefix="ts">
-  <eClassifiers xsi:type="ecore:EClass" name="IAbstractArtifact" abstract="true" eSuperTypes="#//IQualifiedNamedComponent">
-    <eOperations name="getAncestors" upperBound="-1" eType="#//IAbstractArtifact"/>
-    <eOperations name="getExtendingArtifacts" upperBound="-1" eType="#//IAbstractArtifact"/>
-    <eOperations name="getImplementingArtifact" upperBound="-1" eType="#//IAbstractArtifact"/>
-    <eOperations name="getInheritedFields" upperBound="-1" eType="#//IField"/>
-    <eOperations name="getInheritedMethods" upperBound="-1" eType="#//IMethod"/>
-    <eOperations name="getReferencedArtifacts" upperBound="-1" eType="#//IAbstractArtifact"/>
-    <eOperations name="hasExtends" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="fields" upperBound="-1"
-        eType="#//IField" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="methods" upperBound="-1"
-        eType="#//IMethod" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="literals" upperBound="-1"
-        eType="#//ILiteral" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="extendedArtifact" eType="#//IAbstractArtifact"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="implementedArtifacts" upperBound="-1"
-        eType="#//IAbstractArtifact"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="standardSpecifics" eType="#//extensions/IStandardSpecifics"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPrimitiveType" eSuperTypes="#//IAbstractArtifact"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IManagedEntityArtifact" eSuperTypes="#//IAbstractArtifact">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="primaryKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IDatatypeArtifact" eSuperTypes="#//IAbstractArtifact"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IExceptionArtifact" eSuperTypes="#//IAbstractArtifact"/>
-  <eClassifiers xsi:type="ecore:EClass" name="ISessionArtifact" eSuperTypes="#//IAbstractArtifact">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="managedEntities" upperBound="-1"
-        eType="#//extensions/ossj/IManagedEntityDetails"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="emittedNotifications" upperBound="-1"
-        eType="#//IEventArtifact"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="supportedNamedQueries"
-        upperBound="-1" eType="#//IQueryArtifact"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exposedUpdateProcedures"
-        upperBound="-1" eType="#//IUpdateProcedureArtifact"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IQueryArtifact" eSuperTypes="#//IAbstractArtifact">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="returnedType" upperBound="-1"
-        eType="#//IType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IUpdateProcedureArtifact" eSuperTypes="#//IAbstractArtifact"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IEventArtifact" eSuperTypes="#//IAbstractArtifact"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IAssociationArtifact" eSuperTypes="#//IAbstractArtifact">
-    <eOperations name="getAssociationEnds" upperBound="-1" eType="#//IAssociationEnd"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="aEnd" lowerBound="1" eType="#//IAssociationEnd"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="zEnd" lowerBound="1" eType="#//IAssociationEnd"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IAssociationClassArtifact" eSuperTypes="#//IAssociationArtifact #//IManagedEntityArtifact"/>
-  <eClassifiers xsi:type="ecore:EClass" name="IDependencyArtifact" eSuperTypes="#//IAbstractArtifact">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="aEndType" lowerBound="1"
-        eType="#//IType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="zEndType" lowerBound="1"
-        eType="#//IType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IEnumArtifact" eSuperTypes="#//IAbstractArtifact">
-    <eOperations name="getMaxLiteral" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="getMinLiteral" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="baseType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        defaultValueLiteral="int"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IField" eSuperTypes="#//IModelComponent">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="readOnly" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//IType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refBy" eType="#//ERefByEnum"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="ERefByEnum">
-    <eLiterals name="nonApplicable"/>
-    <eLiterals name="refByKey" value="1"/>
-    <eLiterals name="refByKeyResult" value="2"/>
-    <eLiterals name="refByValue" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMethod" eSuperTypes="#//IModelComponent">
-    <eOperations name="getEntityMethodFlavorDetails" eType="#//IEntityMethodFlavorDetails">
-      <eParameters name="flavor" eType="#//OssjEntityMethodFlavor"/>
-    </eOperations>
-    <eOperations name="setEntityMethodFlavorDetails">
-      <eParameters name="flavor" eType="#//OssjEntityMethodFlavor"/>
-      <eParameters name="details" eType="#//IEntityMethodFlavorDetails"/>
-    </eOperations>
-    <eOperations name="getMethodId" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="arguments" upperBound="-1"
-        eType="#//IArgument"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="returnType" eType="#//IType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="abstract" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="optional" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptions" upperBound="-1"
-        eType="#//IType"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="void" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="iteratorReturn" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="returnRefBy" eType="#//ERefByEnum"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="instanceMethod" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultReturnValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodReturnName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="returnStereotypeInstances"
-        upperBound="-1" eType="#//IStereotypeInstance"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="entityMethodFlavorDetails"
-        upperBound="-1" eType="#//IEntityMethodFlavorDetails"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="ILiteral" eSuperTypes="#//IModelComponent">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//IType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IModelComponent" abstract="true" eSuperTypes="#//IStereotypeCapable">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="visibility" eType="#//VisibilityEnum"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IQualifiedNamedComponent" abstract="true"
-      eSuperTypes="#//IModelComponent">
-    <eOperations name="getFullyQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="package" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IType">
-    <eOperations name="getName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="getPackage" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eOperations name="isArtifact" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isDatatype" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isEntityType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isEnum" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eOperations name="isPrimitive" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="fullyQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//IMultiplicity"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IAssociationEnd" eSuperTypes="#//IModelComponent">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="aggregation" lowerBound="1"
-        eType="#//EAggregationEnum"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="changeable" eType="#//EChangeableEnum"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="navigable" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordered" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" lowerBound="1"
-        eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="multiplicity" eType="#//IMultiplicity"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" eType="#//IAbstractArtifact"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="VisibilityEnum">
-    <eLiterals name="public"/>
-    <eLiterals name="package" value="1"/>
-    <eLiterals name="private" value="2"/>
-    <eLiterals name="protected" value="3"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="EAggregationEnum">
-    <eLiterals name="none"/>
-    <eLiterals name="shared" value="1"/>
-    <eLiterals name="composite" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="EChangeableEnum">
-    <eLiterals name="none"/>
-    <eLiterals name="frozen" value="1"/>
-    <eLiterals name="addOnly" value="2"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IArgument" eSuperTypes="#//IModelComponent">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="type" lowerBound="1" eType="#//IType"
-        containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="defaultValue" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-        unsettable="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="ordered" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="unique" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="refBy" eType="#//ERefByEnum"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IModel" eSuperTypes="#//IModelComponent">
-    <eOperations name="getAllArtifacts" upperBound="-1" eType="#//IAbstractArtifact"/>
-    <eOperations name="getArtifactByName" eType="#//IAbstractArtifact">
-      <eParameters name="fullyQualifiedName" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="packages" upperBound="-1"
-        eType="#//IPackage" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IPackage">
-    <eStructuralFeatures xsi:type="ecore:EReference" name="artifacts" upperBound="-1"
-        eType="#//IAbstractArtifact" containment="true"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IStereotypeCapable">
-    <eOperations name="getStereotypeInstanceByName" eType="#//IStereotypeInstance">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eOperations name="hasStereotypeInstance" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean">
-      <eParameters name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eOperations>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="stereotypeInstances" upperBound="-1"
-        eType="#//IStereotypeInstance"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IStereotypeInstance">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="attributeValues" upperBound="-1"
-        eType="#//IStereotypeAttributeValue" containment="true"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IStereotypeAttributeValue">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EEnum" name="OssjEntityMethodFlavor">
-    <eLiterals name="simple"/>
-    <eLiterals name="simpleByKey" value="1"/>
-    <eLiterals name="bulkAtomic" value="2"/>
-    <eLiterals name="bulkAtomicByKeys" value="3"/>
-    <eLiterals name="bulkBestEffort" value="4"/>
-    <eLiterals name="bulkBestEffortByKeys" value="5"/>
-    <eLiterals name="byTemplate" value="6"/>
-    <eLiterals name="byTemplates" value="7"/>
-    <eLiterals name="byTemplateBestEffort" value="8"/>
-    <eLiterals name="byTemplatesBestEffort" value="9"/>
-    <eLiterals name="byAutoNaming" value="10"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IEntityMethodFlavorDetails">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="comment" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="flag" eType="#//extensions/ossj/EEntityMethodFlavorFlag"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="exceptions" upperBound="-1"
-        eType="#//IType"/>
-    <eStructuralFeatures xsi:type="ecore:EReference" name="method" eType="#//IMethod"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="flavor" eType="#//OssjEntityMethodFlavor"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="methodType" eType="#//extensions/ossj/EMethodType"/>
-  </eClassifiers>
-  <eClassifiers xsi:type="ecore:EClass" name="IMultiplicity">
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="lowerBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-    <eStructuralFeatures xsi:type="ecore:EAttribute" name="upperBound" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-  </eClassifiers>
-  <eSubpackages name="extensions" nsURI="tigerstripe-extensions" nsPrefix="ts-extensions">
-    <eClassifiers xsi:type="ecore:EClass" name="IStandardSpecifics" abstract="true"/>
-    <eClassifiers xsi:type="ecore:EClass" name="IProperties">
-      <eStructuralFeatures xsi:type="ecore:EReference" name="entries" eType="#//extensions/IProperty"/>
-    </eClassifiers>
-    <eClassifiers xsi:type="ecore:EClass" name="IProperty">
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="name" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      <eStructuralFeatures xsi:type="ecore:EAttribute" name="value" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-    </eClassifiers>
-    <eSubpackages name="ossj" nsURI="tigerstripe-ossj" nsPrefix="ts-ossj">
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjArtifactSpecifics" eSuperTypes="#//extensions/IStandardSpecifics">
-        <eOperations name="mergeInterfaceProperties">
-          <eParameters name="interfaceProperties" eType="#//extensions/IProperties"/>
-        </eOperations>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceProperties"
-            eType="#//extensions/IProperties"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjDatatypeSpecifics" eSuperTypes="#//extensions/ossj/IOssjArtifactSpecifics">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="singleExtensionType"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="sessionFactoryMethods"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjEntitySpecifics" eSuperTypes="#//extensions/ossj/IOssjArtifactSpecifics">
-        <eOperations name="getCRUDFlavorDetails" eType="#//IEntityMethodFlavorDetails">
-          <eParameters name="crudID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-          <eParameters name="flavor" eType="#//OssjEntityMethodFlavor"/>
-        </eOperations>
-        <eOperations name="setCRUDFlavorDetails">
-          <eParameters name="crudID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-          <eParameters name="flavor" eType="#//OssjEntityMethodFlavor"/>
-          <eParameters name="details" eType="#//IEntityMethodFlavorDetails"/>
-        </eOperations>
-        <eOperations name="getSupportedFlavors" upperBound="-1" eType="#//OssjEntityMethodFlavor">
-          <eParameters name="crudID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EInt"/>
-        </eOperations>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="flavorDetails" upperBound="-1"
-            eType="#//IEntityMethodFlavorDetails"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="primaryKey" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"
-            defaultValueLiteral="String"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensibilityType"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="sessionFactoryMethods"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="interfaceKeyProperties"
-            eType="#//extensions/IProperties"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjEnumSpecifics" eSuperTypes="#//extensions/ossj/IOssjArtifactSpecifics">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="extensible" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="baseIType" eType="#//IType"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjEventSpecifics" eSuperTypes="#//extensions/ossj/IOssjArtifactSpecifics">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="singleExtensionType"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="eventDescriptorEntries"
-            upperBound="-1" eType="#//extensions/ossj/IEventDescriptorEntry"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="customEventDescriptorEntries"
-            upperBound="-1" eType="#//extensions/ossj/IEventDescriptorEntry"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IEventDescriptorEntry">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="label" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="primitiveType" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjQuerySpecifics" eSuperTypes="#//extensions/ossj/IOssjArtifactSpecifics">
-        <eStructuralFeatures xsi:type="ecore:EReference" name="returnedEntityIType"
-            eType="#//IType"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="singleExtensionType"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="sessionFactoryMethods"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IOssjUpdateProcedureSpecifics" eSuperTypes="#//extensions/ossj/IOssjArtifactSpecifics">
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="singleExtensionType"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-        <eStructuralFeatures xsi:type="ecore:EAttribute" name="sessionFactoryMethods"
-            eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EBoolean"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EEnum" name="EMethodType">
-        <eLiterals name="CRUD_CREATE"/>
-        <eLiterals name="CRUD_GET" value="1"/>
-        <eLiterals name="CRUD_SET" value="2"/>
-        <eLiterals name="CRUD_REMOVE" value="3"/>
-        <eLiterals name="CUSTOM" value="-1"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EClass" name="IManagedEntityDetails">
-        <eOperations name="getCRUDFlavorDetails" eType="#//IEntityMethodFlavorDetails">
-          <eParameters name="methodType" eType="#//extensions/ossj/EMethodType"/>
-          <eParameters name="flavor" eType="#//OssjEntityMethodFlavor"/>
-        </eOperations>
-        <eOperations name="getCustomMethodFlavorDetails" eType="#//IEntityMethodFlavorDetails">
-          <eParameters name="flavor" eType="#//OssjEntityMethodFlavor"/>
-          <eParameters name="methodID" eType="ecore:EDataType http://www.eclipse.org/emf/2002/Ecore#//EString"/>
-        </eOperations>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="managedEntity" eType="#//IManagedEntityArtifact"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="crudFlavorDetails"
-            upperBound="-1" eType="#//IEntityMethodFlavorDetails"/>
-        <eStructuralFeatures xsi:type="ecore:EReference" name="customMethodFlavorDetails"
-            upperBound="-1" eType="#//IEntityMethodFlavorDetails"/>
-      </eClassifiers>
-      <eClassifiers xsi:type="ecore:EEnum" name="EEntityMethodFlavorFlag">
-        <eLiterals name="true"/>
-        <eLiterals name="false" value="1"/>
-        <eLiterals name="optional" value="2"/>
-      </eClassifiers>
-    </eSubpackages>
-  </eSubpackages>
-  <eSubpackages name="instance" nsURI="tigerstripe-instance" nsPrefix="ts-instance">
-    <eClassifiers xsi:type="ecore:EClass" name="ArtifactInstance" abstract="true"/>
-  </eSubpackages>
-</ecore:EPackage>
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/model/tigerstripe.genmodel b/plugins/org.eclipse.tigerstripe.metamodel/model/tigerstripe.genmodel
deleted file mode 100644
index 2d15c60..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/model/tigerstripe.genmodel
+++ /dev/null
@@ -1,309 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<genmodel:GenModel xmi:version="2.0"
-    xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.tigerstripe.metamodel/src"
-    modelPluginID="org.eclipse.tigerstripe.metamodel" modelName="Tigerstripe" importerID="org.eclipse.emf.importer.ecore"
-    complianceLevel="6.0" copyrightFields="false">
-  <foreignModel>tigerstripe.ecore</foreignModel>
-  <genPackages prefix="Metamodel" basePackage="org.eclipse.tigerstripe" disposableProviderFactory="true"
-      ecorePackage="tigerstripe.ecore#/">
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//ERefByEnum">
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//ERefByEnum/nonApplicable"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//ERefByEnum/refByKey"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//ERefByEnum/refByKeyResult"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//ERefByEnum/refByValue"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//VisibilityEnum">
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//VisibilityEnum/public"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//VisibilityEnum/package"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//VisibilityEnum/private"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//VisibilityEnum/protected"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//EAggregationEnum">
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//EAggregationEnum/none"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//EAggregationEnum/shared"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//EAggregationEnum/composite"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//EChangeableEnum">
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//EChangeableEnum/none"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//EChangeableEnum/frozen"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//EChangeableEnum/addOnly"/>
-    </genEnums>
-    <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//OssjEntityMethodFlavor">
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/simple"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/simpleByKey"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/bulkAtomic"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/bulkAtomicByKeys"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/bulkBestEffort"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/bulkBestEffortByKeys"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/byTemplate"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/byTemplates"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/byTemplateBestEffort"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/byTemplatesBestEffort"/>
-      <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//OssjEntityMethodFlavor/byAutoNaming"/>
-    </genEnums>
-    <genClasses image="false" ecoreClass="tigerstripe.ecore#//IAbstractArtifact">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAbstractArtifact/fields"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAbstractArtifact/methods"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAbstractArtifact/literals"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IAbstractArtifact/abstract"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAbstractArtifact/extendedArtifact"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAbstractArtifact/implementedArtifacts"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAbstractArtifact/standardSpecifics"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/getAncestors"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/getExtendingArtifacts"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/getImplementingArtifact"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/getInheritedFields"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/getInheritedMethods"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/getReferencedArtifacts"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAbstractArtifact/hasExtends"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IPrimitiveType"/>
-    <genClasses ecoreClass="tigerstripe.ecore#//IManagedEntityArtifact">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IManagedEntityArtifact/primaryKey"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IDatatypeArtifact"/>
-    <genClasses ecoreClass="tigerstripe.ecore#//IExceptionArtifact"/>
-    <genClasses ecoreClass="tigerstripe.ecore#//ISessionArtifact">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//ISessionArtifact/managedEntities"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//ISessionArtifact/emittedNotifications"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//ISessionArtifact/supportedNamedQueries"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//ISessionArtifact/exposedUpdateProcedures"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IQueryArtifact">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IQueryArtifact/returnedType"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IUpdateProcedureArtifact"/>
-    <genClasses ecoreClass="tigerstripe.ecore#//IEventArtifact"/>
-    <genClasses ecoreClass="tigerstripe.ecore#//IAssociationArtifact">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAssociationArtifact/aEnd"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAssociationArtifact/zEnd"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IAssociationArtifact/getAssociationEnds"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IAssociationClassArtifact"/>
-    <genClasses ecoreClass="tigerstripe.ecore#//IDependencyArtifact">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IDependencyArtifact/aEndType"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IDependencyArtifact/zEndType"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IEnumArtifact">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IEnumArtifact/baseType"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IEnumArtifact/getMaxLiteral"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IEnumArtifact/getMinLiteral"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IField">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IField/optional"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IField/readOnly"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IField/ordered"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IField/unique"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IField/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IField/defaultValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IField/refBy"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IMethod">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IMethod/arguments"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IMethod/returnType"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/abstract"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/ordered"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/unique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/optional"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IMethod/exceptions"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/void"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/iteratorReturn"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/returnRefBy"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/instanceMethod"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/defaultReturnValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMethod/methodReturnName"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IMethod/returnStereotypeInstances"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IMethod/entityMethodFlavorDetails"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IMethod/getEntityMethodFlavorDetails">
-        <genParameters ecoreParameter="tigerstripe.ecore#//IMethod/getEntityMethodFlavorDetails/flavor"/>
-      </genOperations>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IMethod/setEntityMethodFlavorDetails">
-        <genParameters ecoreParameter="tigerstripe.ecore#//IMethod/setEntityMethodFlavorDetails/flavor"/>
-        <genParameters ecoreParameter="tigerstripe.ecore#//IMethod/setEntityMethodFlavorDetails/details"/>
-      </genOperations>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IMethod/getMethodId"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//ILiteral">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//ILiteral/value"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//ILiteral/type"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="tigerstripe.ecore#//IModelComponent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IModelComponent/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IModelComponent/comment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IModelComponent/visibility"/>
-    </genClasses>
-    <genClasses image="false" ecoreClass="tigerstripe.ecore#//IQualifiedNamedComponent">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IQualifiedNamedComponent/package"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IQualifiedNamedComponent/getFullyQualifiedName"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IType">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IType/fullyQualifiedName"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IType/multiplicity"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/getName"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/getPackage"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/isArtifact"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/isDatatype"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/isEntityType"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/isEnum"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IType/isPrimitive"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IAssociationEnd">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IAssociationEnd/aggregation"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IAssociationEnd/changeable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IAssociationEnd/navigable"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IAssociationEnd/ordered"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IAssociationEnd/unique"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAssociationEnd/multiplicity"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IAssociationEnd/type"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IArgument">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IArgument/type"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IArgument/defaultValue"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IArgument/ordered"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IArgument/unique"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IArgument/refBy"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IModel">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IModel/packages"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IModel/getAllArtifacts"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IModel/getArtifactByName">
-        <genParameters ecoreParameter="tigerstripe.ecore#//IModel/getArtifactByName/fullyQualifiedName"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IPackage">
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IPackage/artifacts"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IPackage/name"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IStereotypeCapable">
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IStereotypeCapable/stereotypeInstances"/>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IStereotypeCapable/getStereotypeInstanceByName">
-        <genParameters ecoreParameter="tigerstripe.ecore#//IStereotypeCapable/getStereotypeInstanceByName/name"/>
-      </genOperations>
-      <genOperations ecoreOperation="tigerstripe.ecore#//IStereotypeCapable/hasStereotypeInstance">
-        <genParameters ecoreParameter="tigerstripe.ecore#//IStereotypeCapable/hasStereotypeInstance/name"/>
-      </genOperations>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IStereotypeInstance">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IStereotypeInstance/name"/>
-      <genFeatures property="None" children="true" createChild="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IStereotypeInstance/attributeValues"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IStereotypeAttributeValue">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IStereotypeAttributeValue/name"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IStereotypeAttributeValue/value"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IEntityMethodFlavorDetails">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IEntityMethodFlavorDetails/comment"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IEntityMethodFlavorDetails/flag"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IEntityMethodFlavorDetails/exceptions"/>
-      <genFeatures notify="false" createChild="false" propertySortChoices="true" ecoreFeature="ecore:EReference tigerstripe.ecore#//IEntityMethodFlavorDetails/method"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IEntityMethodFlavorDetails/flavor"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IEntityMethodFlavorDetails/methodType"/>
-    </genClasses>
-    <genClasses ecoreClass="tigerstripe.ecore#//IMultiplicity">
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMultiplicity/lowerBound"/>
-      <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//IMultiplicity/upperBound"/>
-    </genClasses>
-    <nestedGenPackages prefix="Extensions" basePackage="org.eclipse.tigerstripe.metamodel"
-        disposableProviderFactory="true" ecorePackage="tigerstripe.ecore#//extensions">
-      <genClasses image="false" ecoreClass="tigerstripe.ecore#//extensions/IStandardSpecifics"/>
-      <genClasses ecoreClass="tigerstripe.ecore#//extensions/IProperties">
-        <genFeatures notify="false" createChild="false" propertySortChoices="true"
-            ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/IProperties/entries"/>
-      </genClasses>
-      <genClasses ecoreClass="tigerstripe.ecore#//extensions/IProperty">
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/IProperty/name"/>
-        <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/IProperty/value"/>
-      </genClasses>
-      <nestedGenPackages prefix="Ossj" basePackage="org.eclipse.tigerstripe.metamodel.extensions"
-          disposableProviderFactory="true" ecorePackage="tigerstripe.ecore#//extensions/ossj">
-        <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//extensions/ossj/EMethodType">
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EMethodType/CRUD_CREATE"/>
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EMethodType/CRUD_GET"/>
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EMethodType/CRUD_SET"/>
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EMethodType/CRUD_REMOVE"/>
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EMethodType/CUSTOM"/>
-        </genEnums>
-        <genEnums typeSafeEnumCompatible="false" ecoreEnum="tigerstripe.ecore#//extensions/ossj/EEntityMethodFlavorFlag">
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EEntityMethodFlavorFlag/true"/>
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EEntityMethodFlavorFlag/false"/>
-          <genEnumLiterals ecoreEnumLiteral="tigerstripe.ecore#//extensions/ossj/EEntityMethodFlavorFlag/optional"/>
-        </genEnums>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjArtifactSpecifics">
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjArtifactSpecifics/interfaceProperties"/>
-          <genOperations ecoreOperation="tigerstripe.ecore#//extensions/ossj/IOssjArtifactSpecifics/mergeInterfaceProperties">
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjArtifactSpecifics/mergeInterfaceProperties/interfaceProperties"/>
-          </genOperations>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjDatatypeSpecifics">
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjDatatypeSpecifics/singleExtensionType"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjDatatypeSpecifics/sessionFactoryMethods"/>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics">
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/flavorDetails"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/primaryKey"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/extensibilityType"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/sessionFactoryMethods"/>
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/interfaceKeyProperties"/>
-          <genOperations ecoreOperation="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/getCRUDFlavorDetails">
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/getCRUDFlavorDetails/crudID"/>
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/getCRUDFlavorDetails/flavor"/>
-          </genOperations>
-          <genOperations ecoreOperation="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/setCRUDFlavorDetails">
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/setCRUDFlavorDetails/crudID"/>
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/setCRUDFlavorDetails/flavor"/>
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/setCRUDFlavorDetails/details"/>
-          </genOperations>
-          <genOperations ecoreOperation="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/getSupportedFlavors">
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IOssjEntitySpecifics/getSupportedFlavors/crudID"/>
-          </genOperations>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjEnumSpecifics">
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjEnumSpecifics/extensible"/>
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjEnumSpecifics/baseIType"/>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjEventSpecifics">
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjEventSpecifics/singleExtensionType"/>
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjEventSpecifics/eventDescriptorEntries"/>
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjEventSpecifics/customEventDescriptorEntries"/>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IEventDescriptorEntry">
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IEventDescriptorEntry/label"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IEventDescriptorEntry/primitiveType"/>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjQuerySpecifics">
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IOssjQuerySpecifics/returnedEntityIType"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjQuerySpecifics/singleExtensionType"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjQuerySpecifics/sessionFactoryMethods"/>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IOssjUpdateProcedureSpecifics">
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjUpdateProcedureSpecifics/singleExtensionType"/>
-          <genFeatures createChild="false" ecoreFeature="ecore:EAttribute tigerstripe.ecore#//extensions/ossj/IOssjUpdateProcedureSpecifics/sessionFactoryMethods"/>
-        </genClasses>
-        <genClasses ecoreClass="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails">
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/managedEntity"/>
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/crudFlavorDetails"/>
-          <genFeatures notify="false" createChild="false" propertySortChoices="true"
-              ecoreFeature="ecore:EReference tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/customMethodFlavorDetails"/>
-          <genOperations ecoreOperation="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/getCRUDFlavorDetails">
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/getCRUDFlavorDetails/methodType"/>
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/getCRUDFlavorDetails/flavor"/>
-          </genOperations>
-          <genOperations ecoreOperation="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/getCustomMethodFlavorDetails">
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/getCustomMethodFlavorDetails/flavor"/>
-            <genParameters ecoreParameter="tigerstripe.ecore#//extensions/ossj/IManagedEntityDetails/getCustomMethodFlavorDetails/methodID"/>
-          </genOperations>
-        </genClasses>
-      </nestedGenPackages>
-    </nestedGenPackages>
-  </genPackages>
-</genmodel:GenModel>
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/plugin.properties b/plugins/org.eclipse.tigerstripe.metamodel/plugin.properties
deleted file mode 100644
index 66ffdd1..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/plugin.properties
+++ /dev/null
@@ -1,20 +0,0 @@
-
-# <copyright>
-# </copyright>
-#
-# $Id: plugin.properties,v 1.2 2008/03/08 20:55:29 edillon Exp $
-
-# ====================================================================
-# To code developer:
-#   Do NOT change the properties between this line and the
-#   "%%% END OF TRANSLATED PROPERTIES %%%" line.
-#   Make a new property name, append to the end of the file and change
-#   the code to use the new property.
-# ====================================================================
-
-# ====================================================================
-# %%% END OF TRANSLATED PROPERTIES %%%
-# ====================================================================
-
-pluginName = Tigerstripe Metamodel Plugin (Incubation
-providerName = www.example.org
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/plugin.xml b/plugins/org.eclipse.tigerstripe.metamodel/plugin.xml
deleted file mode 100644
index bb508cb..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/plugin.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.0"?>
-
-<!--
- <copyright>
- </copyright>
-
- $Id: plugin.xml,v 1.2 2008/02/22 22:34:03 edillon Exp $
--->
-
-<plugin>
-   <extension-point id="customArtifactMetadata" name="Custom Artifact Metadata" schema="schema/customArtifactMetadata.exsd"/>
-
-  <extension point="org.eclipse.emf.ecore.generated_package">
-    <package 
-       uri = "tigerstripe" 
-       class = "org.eclipse.tigerstripe.metamodel.MetamodelPackage"
-       genModel = "model/tigerstripe.genmodel" /> 
-  </extension>
-
-</plugin>
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/schema/customArtifactMetadata.exsd b/plugins/org.eclipse.tigerstripe.metamodel/schema/customArtifactMetadata.exsd
deleted file mode 100644
index 9df67c2..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/schema/customArtifactMetadata.exsd
+++ /dev/null
@@ -1,168 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Schema file written by PDE -->
-<schema targetNamespace="org.eclipse.tigerstripe.metamodel">
-<annotation>
-      <appInfo>
-         <meta.schema plugin="org.eclipse.tigerstripe.metamodel" id="customArtifactMetadata" name="Custom Artifact Metadata"/>
-      </appInfo>
-      <documentation>
-         This extension point allows to customize the Artifact Metadata used in Tigerstripe.
-      </documentation>
-   </annotation>
-
-   <element name="extension">
-      <complexType>
-         <choice minOccurs="1" maxOccurs="unbounded">
-            <element ref="artifactMetadata"/>
-         </choice>
-         <attribute name="point" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="id" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="name" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute translatable="true"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <element name="artifactMetadata">
-      <annotation>
-         <appInfo>
-            <meta.element labelAttribute="userLabel" icon="icon"/>
-         </appInfo>
-      </annotation>
-      <complexType>
-         <attribute name="artifactType" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="java" basedOn="org.eclipse.tigerstripe.metamodel.impl.IAbstractArtifactImpl:"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="userLabel" type="string" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="hasFields" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="hasMethods" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="hasLiterals" type="boolean" use="required">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-            </annotation>
-         </attribute>
-         <attribute name="icon" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon_new" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-         <attribute name="icon_gs" type="string">
-            <annotation>
-               <documentation>
-                  
-               </documentation>
-               <appInfo>
-                  <meta.attribute kind="resource"/>
-               </appInfo>
-            </annotation>
-         </attribute>
-      </complexType>
-   </element>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="since"/>
-      </appInfo>
-      <documentation>
-         [Enter the first release in which this extension point appears.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="examples"/>
-      </appInfo>
-      <documentation>
-         [Enter extension point usage example here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="apiInfo"/>
-      </appInfo>
-      <documentation>
-         [Enter API information here.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="implementation"/>
-      </appInfo>
-      <documentation>
-         [Enter information about supplied implementation of this extension point.]
-      </documentation>
-   </annotation>
-
-   <annotation>
-      <appInfo>
-         <meta.section type="copyright"/>
-      </appInfo>
-      <documentation>
-         
-      </documentation>
-   </annotation>
-
-</schema>
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/Activator.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/Activator.java
deleted file mode 100644
index d5a3c3d..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/Activator.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. - Initial Version
- *******************************************************************************/
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.core.runtime.Plugin;
-
-public class Activator extends Plugin {
-	public final static String PLUGIN_ID = "org.eclipse.tigerstripe.metadata";
-
-	// The shared instance.
-	private static Activator plugin;
-
-	public Activator() {
-		super();
-		plugin = this;
-	}
-
-	public static Activator getDefault() {
-		return plugin;
-	}
-
-	public static String getPluginId() {
-		return PLUGIN_ID;
-	}
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EAggregationEnum.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EAggregationEnum.java
deleted file mode 100644
index 90cafc7..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EAggregationEnum.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EAggregationEnum.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>EAggregation Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getEAggregationEnum()
- * @model
- * @generated
- */
-public enum EAggregationEnum implements Enumerator {
-	/**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(0, "none", "none"),
-
-	/**
-	 * The '<em><b>Shared</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #SHARED_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	SHARED(1, "shared", "shared"),
-
-	/**
-	 * The '<em><b>Composite</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #COMPOSITE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	COMPOSITE(2, "composite", "composite");
-
-	/**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @model name="none"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE_VALUE = 0;
-
-	/**
-	 * The '<em><b>Shared</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Shared</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #SHARED
-	 * @model name="shared"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int SHARED_VALUE = 1;
-
-	/**
-	 * The '<em><b>Composite</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Composite</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #COMPOSITE
-	 * @model name="composite"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int COMPOSITE_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>EAggregation Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EAggregationEnum[] VALUES_ARRAY =
-		new EAggregationEnum[] {
-			NONE,
-			SHARED,
-			COMPOSITE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>EAggregation Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<EAggregationEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>EAggregation Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EAggregationEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EAggregationEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>EAggregation Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EAggregationEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EAggregationEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>EAggregation Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EAggregationEnum get(int value) {
-		switch (value) {
-			case NONE_VALUE: return NONE;
-			case SHARED_VALUE: return SHARED;
-			case COMPOSITE_VALUE: return COMPOSITE;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EAggregationEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //EAggregationEnum
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EChangeableEnum.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EChangeableEnum.java
deleted file mode 100644
index 5eb2296..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EChangeableEnum.java
+++ /dev/null
@@ -1,239 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EChangeableEnum.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>EChangeable Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getEChangeableEnum()
- * @model
- * @generated
- */
-public enum EChangeableEnum implements Enumerator {
-	/**
-	 * The '<em><b>None</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NONE(0, "none", "none"),
-
-	/**
-	 * The '<em><b>Frozen</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #FROZEN_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	FROZEN(1, "frozen", "frozen"),
-
-	/**
-	 * The '<em><b>Add Only</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ADD_ONLY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ADD_ONLY(2, "addOnly", "addOnly");
-
-	/**
-	 * The '<em><b>None</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>None</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NONE
-	 * @model name="none"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NONE_VALUE = 0;
-
-	/**
-	 * The '<em><b>Frozen</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Frozen</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #FROZEN
-	 * @model name="frozen"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int FROZEN_VALUE = 1;
-
-	/**
-	 * The '<em><b>Add Only</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Add Only</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ADD_ONLY
-	 * @model name="addOnly"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ADD_ONLY_VALUE = 2;
-
-	/**
-	 * An array of all the '<em><b>EChangeable Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EChangeableEnum[] VALUES_ARRAY =
-		new EChangeableEnum[] {
-			NONE,
-			FROZEN,
-			ADD_ONLY,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>EChangeable Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<EChangeableEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>EChangeable Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EChangeableEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EChangeableEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>EChangeable Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EChangeableEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EChangeableEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>EChangeable Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EChangeableEnum get(int value) {
-		switch (value) {
-			case NONE_VALUE: return NONE;
-			case FROZEN_VALUE: return FROZEN;
-			case ADD_ONLY_VALUE: return ADD_ONLY;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EChangeableEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //EChangeableEnum
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EMultiplicity.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EMultiplicity.java
deleted file mode 100644
index c40c18e..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/EMultiplicity.java
+++ /dev/null
@@ -1,320 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: EMultiplicity.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>EMultiplicity</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getEMultiplicity()
- * @model
- * @generated
- */
-public enum EMultiplicity implements Enumerator {
-	/**
-	 * The '<em><b>One</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ONE(0, "one", "one"),
-
-	/**
-	 * The '<em><b>Zero</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZERO_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ZERO(1, "zero", "zero"),
-
-	/**
-	 * The '<em><b>Zero one</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZERO_ONE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ZERO_ONE(2, "zero_one", "zero_one"),
-
-	/**
-	 * The '<em><b>Zero star</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ZERO_STAR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ZERO_STAR(3, "zero_star", "zero_star"),
-
-	/**
-	 * The '<em><b>One star</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #ONE_STAR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	ONE_STAR(4, "one_star", "one_star"),
-
-	/**
-	 * The '<em><b>Star</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #STAR_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	STAR(5, "star", "star");
-
-	/**
-	 * The '<em><b>One</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>One</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ONE
-	 * @model name="one"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ONE_VALUE = 0;
-
-	/**
-	 * The '<em><b>Zero</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Zero</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZERO
-	 * @model name="zero"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZERO_VALUE = 1;
-
-	/**
-	 * The '<em><b>Zero one</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Zero one</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZERO_ONE
-	 * @model name="zero_one"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZERO_ONE_VALUE = 2;
-
-	/**
-	 * The '<em><b>Zero star</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Zero star</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ZERO_STAR
-	 * @model name="zero_star"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ZERO_STAR_VALUE = 3;
-
-	/**
-	 * The '<em><b>One star</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>One star</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #ONE_STAR
-	 * @model name="one_star"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int ONE_STAR_VALUE = 4;
-
-	/**
-	 * The '<em><b>Star</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Star</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #STAR
-	 * @model name="star"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int STAR_VALUE = 5;
-
-	/**
-	 * An array of all the '<em><b>EMultiplicity</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final EMultiplicity[] VALUES_ARRAY =
-		new EMultiplicity[] {
-			ONE,
-			ZERO,
-			ZERO_ONE,
-			ZERO_STAR,
-			ONE_STAR,
-			STAR,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>EMultiplicity</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<EMultiplicity> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>EMultiplicity</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EMultiplicity get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EMultiplicity result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>EMultiplicity</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EMultiplicity getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			EMultiplicity result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>EMultiplicity</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static EMultiplicity get(int value) {
-		switch (value) {
-			case ONE_VALUE: return ONE;
-			case ZERO_VALUE: return ZERO;
-			case ZERO_ONE_VALUE: return ZERO_ONE;
-			case ZERO_STAR_VALUE: return ZERO_STAR;
-			case ONE_STAR_VALUE: return ONE_STAR;
-			case STAR_VALUE: return STAR;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private EMultiplicity(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //EMultiplicity
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ERefByEnum.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ERefByEnum.java
deleted file mode 100644
index 5968f7c..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ERefByEnum.java
+++ /dev/null
@@ -1,266 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ERefByEnum.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-
-import org.eclipse.emf.common.util.Enumerator;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the literals of the enumeration '<em><b>ERef By Enum</b></em>',
- * and utility methods for working with them.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getERefByEnum()
- * @model
- * @generated
- */
-public enum ERefByEnum implements Enumerator {
-	/**
-	 * The '<em><b>Non Applicable</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #NON_APPLICABLE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	NON_APPLICABLE(0, "nonApplicable", "nonApplicable"),
-
-	/**
-	 * The '<em><b>Ref By Key</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REF_BY_KEY_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REF_BY_KEY(1, "refByKey", "refByKey"),
-
-	/**
-	 * The '<em><b>Ref By Key Result</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REF_BY_KEY_RESULT_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REF_BY_KEY_RESULT(2, "refByKeyResult", "refByKeyResult"),
-
-	/**
-	 * The '<em><b>Ref By Value</b></em>' literal object.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #REF_BY_VALUE_VALUE
-	 * @generated
-	 * @ordered
-	 */
-	REF_BY_VALUE(3, "refByValue", "refByValue");
-
-	/**
-	 * The '<em><b>Non Applicable</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Non Applicable</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #NON_APPLICABLE
-	 * @model name="nonApplicable"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int NON_APPLICABLE_VALUE = 0;
-
-	/**
-	 * The '<em><b>Ref By Key</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Ref By Key</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REF_BY_KEY
-	 * @model name="refByKey"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REF_BY_KEY_VALUE = 1;
-
-	/**
-	 * The '<em><b>Ref By Key Result</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Ref By Key Result</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REF_BY_KEY_RESULT
-	 * @model name="refByKeyResult"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REF_BY_KEY_RESULT_VALUE = 2;
-
-	/**
-	 * The '<em><b>Ref By Value</b></em>' literal value.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of '<em><b>Ref By Value</b></em>' literal object isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @see #REF_BY_VALUE
-	 * @model name="refByValue"
-	 * @generated
-	 * @ordered
-	 */
-	public static final int REF_BY_VALUE_VALUE = 3;
-
-	/**
-	 * An array of all the '<em><b>ERef By Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private static final ERefByEnum[] VALUES_ARRAY =
-		new ERefByEnum[] {
-			NON_APPLICABLE,
-			REF_BY_KEY,
-			REF_BY_KEY_RESULT,
-			REF_BY_VALUE,
-		};
-
-	/**
-	 * A public read-only list of all the '<em><b>ERef By Enum</b></em>' enumerators.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static final List<ERefByEnum> VALUES = Collections.unmodifiableList(Arrays.asList(VALUES_ARRAY));
-
-	/**
-	 * Returns the '<em><b>ERef By Enum</b></em>' literal with the specified literal value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ERefByEnum get(String literal) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ERefByEnum result = VALUES_ARRAY[i];
-			if (result.toString().equals(literal)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>ERef By Enum</b></em>' literal with the specified name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ERefByEnum getByName(String name) {
-		for (int i = 0; i < VALUES_ARRAY.length; ++i) {
-			ERefByEnum result = VALUES_ARRAY[i];
-			if (result.getName().equals(name)) {
-				return result;
-			}
-		}
-		return null;
-	}
-
-	/**
-	 * Returns the '<em><b>ERef By Enum</b></em>' literal with the specified integer value.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public static ERefByEnum get(int value) {
-		switch (value) {
-			case NON_APPLICABLE_VALUE: return NON_APPLICABLE;
-			case REF_BY_KEY_VALUE: return REF_BY_KEY;
-			case REF_BY_KEY_RESULT_VALUE: return REF_BY_KEY_RESULT;
-			case REF_BY_VALUE_VALUE: return REF_BY_VALUE;
-		}
-		return null;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final int value;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String name;
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private final String literal;
-
-	/**
-	 * Only this class can construct instances.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	private ERefByEnum(int value, String name, String literal) {
-		this.value = value;
-		this.name = name;
-		this.literal = literal;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public int getValue() {
-	  return value;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getName() {
-	  return name;
-	}
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	public String getLiteral() {
-	  return literal;
-	}
-
-	/**
-	 * Returns the literal value of the enumerator, which is its string representation.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	@Override
-	public String toString() {
-		return literal;
-	}
-	
-} //ERefByEnum
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAbstractArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAbstractArtifact.java
deleted file mode 100644
index 300be37..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAbstractArtifact.java
+++ /dev/null
@@ -1,230 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IAbstractArtifact.java,v 1.3 2008/02/28 18:05:32 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.tigerstripe.metamodel.extensions.IStandardSpecifics;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>IAbstract Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getFields <em>Fields</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getMethods <em>Methods</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getLiterals <em>Literals</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getExtendedArtifact <em>Extended Artifact</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getImplementedArtifacts <em>Implemented Artifacts</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getStandardSpecifics <em>Standard Specifics</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact()
- * @model abstract="true"
- * @generated
- */
-public interface IAbstractArtifact extends IQualifiedNamedComponent {
-	/**
-	 * Returns the value of the '<em><b>Fields</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IField}.
-	 * <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of the '<em>Fields</em>' containment reference list
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fields</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_Fields()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<IField> getFields();
-
-	/**
-	 * Returns the value of the '<em><b>Methods</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IMethod}.
-	 * <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of the '<em>Methods</em>' containment reference list
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Methods</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_Methods()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<IMethod> getMethods();
-
-	/**
-	 * Returns the value of the '<em><b>Literals</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.ILiteral}.
-	 * <!-- begin-user-doc
-	 * -->
-	 * <p>
-	 * If the meaning of the '<em>Literals</em>' containment reference list
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Literals</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_Literals()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<ILiteral> getLiterals();
-
-	/**
-	 * Returns the value of the '<em><b>Abstract</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Abstract</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Abstract</em>' attribute.
-	 * @see #setAbstract(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_Abstract()
-	 * @model
-	 * @generated
-	 */
-	boolean isAbstract();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#isAbstract <em>Abstract</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abstract</em>' attribute.
-	 * @see #isAbstract()
-	 * @generated
-	 */
-	void setAbstract(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Extended Artifact</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Extended Artifact</em>' reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Extended Artifact</em>' reference.
-	 * @see #setExtendedArtifact(IAbstractArtifact)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_ExtendedArtifact()
-	 * @model
-	 * @generated
-	 */
-	IAbstractArtifact getExtendedArtifact();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getExtendedArtifact <em>Extended Artifact</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Extended Artifact</em>' reference.
-	 * @see #getExtendedArtifact()
-	 * @generated
-	 */
-	void setExtendedArtifact(IAbstractArtifact value);
-
-	/**
-	 * Returns the value of the '<em><b>Implemented Artifacts</b></em>'
-	 * reference list. The list contents are of type
-	 * {@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact}. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Implemented Artifacts</em>' reference list
-	 * isn't clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Implemented Artifacts</em>' reference
-	 *         list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_ImplementedArtifacts()
-	 * @model
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getImplementedArtifacts();
-
-	/**
-	 * Returns the value of the '<em><b>Standard Specifics</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Standard Specifics</em>' reference isn't
-	 * clear, there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Standard Specifics</em>' reference.
-	 * @see #setStandardSpecifics(IStandardSpecifics)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAbstractArtifact_StandardSpecifics()
-	 * @model
-	 * @generated
-	 */
-	IStandardSpecifics getStandardSpecifics();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact#getStandardSpecifics <em>Standard Specifics</em>}' reference.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Standard Specifics</em>' reference.
-	 * @see #getStandardSpecifics()
-	 * @generated
-	 */
-	void setStandardSpecifics(IStandardSpecifics value);
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getAncestors();
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getExtendingArtifacts();
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getImplementingArtifact();
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IField> getInheritedFields();
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IMethod> getInheritedMethods();
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getReferencedArtifacts();
-
-	/**
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	boolean hasExtends();
-
-} // IAbstractArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IArgument.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IArgument.java
deleted file mode 100644
index a307dc7..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IArgument.java
+++ /dev/null
@@ -1,191 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IArgument.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IArgument</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IArgument#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IArgument#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IArgument#isOrdered <em>Ordered</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IArgument#isUnique <em>Unique</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IArgument#getRefBy <em>Ref By</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIArgument()
- * @model
- * @generated
- */
-public interface IArgument extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' containment reference.
-	 * @see #setType(IType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIArgument_Type()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	IType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#getType <em>Type</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' containment reference.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(IType value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Value</em>' attribute.
-	 * @see #isSetDefaultValue()
-	 * @see #unsetDefaultValue()
-	 * @see #setDefaultValue(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIArgument_DefaultValue()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getDefaultValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#getDefaultValue <em>Default Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' attribute.
-	 * @see #isSetDefaultValue()
-	 * @see #unsetDefaultValue()
-	 * @see #getDefaultValue()
-	 * @generated
-	 */
-	void setDefaultValue(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#getDefaultValue <em>Default Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDefaultValue()
-	 * @see #getDefaultValue()
-	 * @see #setDefaultValue(String)
-	 * @generated
-	 */
-	void unsetDefaultValue();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#getDefaultValue <em>Default Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Default Value</em>' attribute is set.
-	 * @see #unsetDefaultValue()
-	 * @see #getDefaultValue()
-	 * @see #setDefaultValue(String)
-	 * @generated
-	 */
-	boolean isSetDefaultValue();
-
-	/**
-	 * Returns the value of the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ordered</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ordered</em>' attribute.
-	 * @see #setOrdered(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIArgument_Ordered()
-	 * @model
-	 * @generated
-	 */
-	boolean isOrdered();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#isOrdered <em>Ordered</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ordered</em>' attribute.
-	 * @see #isOrdered()
-	 * @generated
-	 */
-	void setOrdered(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIArgument_Unique()
-	 * @model
-	 * @generated
-	 */
-	boolean isUnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#isUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #isUnique()
-	 * @generated
-	 */
-	void setUnique(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Ref By</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.ERefByEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref By</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.ERefByEnum
-	 * @see #setRefBy(ERefByEnum)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIArgument_RefBy()
-	 * @model
-	 * @generated
-	 */
-	ERefByEnum getRefBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IArgument#getRefBy <em>Ref By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref By</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.ERefByEnum
-	 * @see #getRefBy()
-	 * @generated
-	 */
-	void setRefBy(ERefByEnum value);
-
-} // IArgument
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IArtifactMetadata.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IArtifactMetadata.java
deleted file mode 100644
index e4542a5..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IArtifactMetadata.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.metamodel;
-
-import java.net.URL;
-
-/**
- * This interface specifies all the useful metadata for an artifact.
- * 
- * This can be access on any IAbstractArtifact through the getMetadata() method.
- * 
- * Note that a default implementation is provided for each core Tigerstripe
- * Artifact, but this can be customized through the
- * org.eclipse.tigerstripe.metadata.artifactMetadata extension point.
- * 
- * @author erdillon
- * @since 0.2.3
- */
-public interface IArtifactMetadata extends IModelComponentMetadata {
-
-	/**
-	 * Returns true if the specified artifact type supports fields.
-	 * 
-	 * @return
-	 */
-	public boolean hasFields();
-
-	/**
-	 * Returns true if the specified artifact type supports fields.
-	 * 
-	 * @return
-	 */
-	public boolean hasMethods();
-
-	/**
-	 * Returns true if the specified artifact type supports fields.
-	 * 
-	 * @return
-	 */
-	public boolean hasLiterals();
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationArtifact.java
deleted file mode 100644
index 88a05d1..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationArtifact.java
+++ /dev/null
@@ -1,89 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IAssociationArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IAssociation Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationArtifact#getAEnd <em>AEnd</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationArtifact#getZEnd <em>ZEnd</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationArtifact()
- * @model
- * @generated
- */
-public interface IAssociationArtifact extends IAbstractArtifact {
-	/**
-	 * Returns the value of the '<em><b>AEnd</b></em>' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>AEnd</em>' containment reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>AEnd</em>' containment reference.
-	 * @see #setAEnd(IAssociationEnd)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationArtifact_AEnd()
-	 * @model containment="true" required="true"
-	 * @generated
-	 */
-	IAssociationEnd getAEnd();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationArtifact#getAEnd <em>AEnd</em>}' containment reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>AEnd</em>' containment reference.
-	 * @see #getAEnd()
-	 * @generated
-	 */
-	void setAEnd(IAssociationEnd value);
-
-	/**
-	 * Returns the value of the '<em><b>ZEnd</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>ZEnd</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>ZEnd</em>' reference.
-	 * @see #setZEnd(IAssociationEnd)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationArtifact_ZEnd()
-	 * @model required="true"
-	 * @generated
-	 */
-	IAssociationEnd getZEnd();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationArtifact#getZEnd <em>ZEnd</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ZEnd</em>' reference.
-	 * @see #getZEnd()
-	 * @generated
-	 */
-	void setZEnd(IAssociationEnd value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAssociationEnd> getAssociationEnds();
-
-} // IAssociationArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationClassArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationClassArtifact.java
deleted file mode 100644
index 41748e8..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationClassArtifact.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IAssociationClassArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IAssociation Class Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationClassArtifact()
- * @model
- * @generated
- */
-public interface IAssociationClassArtifact extends IAssociationArtifact, IManagedEntityArtifact {
-} // IAssociationClassArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationEnd.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationEnd.java
deleted file mode 100644
index 27f5c78..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IAssociationEnd.java
+++ /dev/null
@@ -1,221 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IAssociationEnd.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IAssociation End</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getAggregation <em>Aggregation</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getChangeable <em>Changeable</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#isNavigable <em>Navigable</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#isOrdered <em>Ordered</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#isUnique <em>Unique</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getMultiplicity <em>Multiplicity</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd()
- * @model
- * @generated
- */
-public interface IAssociationEnd extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Aggregation</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.EAggregationEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Aggregation</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Aggregation</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.EAggregationEnum
-	 * @see #setAggregation(EAggregationEnum)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Aggregation()
-	 * @model required="true"
-	 * @generated
-	 */
-	EAggregationEnum getAggregation();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getAggregation <em>Aggregation</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Aggregation</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.EAggregationEnum
-	 * @see #getAggregation()
-	 * @generated
-	 */
-	void setAggregation(EAggregationEnum value);
-
-	/**
-	 * Returns the value of the '<em><b>Changeable</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.EChangeableEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Changeable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Changeable</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.EChangeableEnum
-	 * @see #setChangeable(EChangeableEnum)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Changeable()
-	 * @model
-	 * @generated
-	 */
-	EChangeableEnum getChangeable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getChangeable <em>Changeable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Changeable</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.EChangeableEnum
-	 * @see #getChangeable()
-	 * @generated
-	 */
-	void setChangeable(EChangeableEnum value);
-
-	/**
-	 * Returns the value of the '<em><b>Navigable</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Navigable</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Navigable</em>' attribute.
-	 * @see #setNavigable(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Navigable()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isNavigable();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#isNavigable <em>Navigable</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Navigable</em>' attribute.
-	 * @see #isNavigable()
-	 * @generated
-	 */
-	void setNavigable(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ordered</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ordered</em>' attribute.
-	 * @see #setOrdered(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Ordered()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isOrdered();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#isOrdered <em>Ordered</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ordered</em>' attribute.
-	 * @see #isOrdered()
-	 * @generated
-	 */
-	void setOrdered(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Unique()
-	 * @model required="true"
-	 * @generated
-	 */
-	boolean isUnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#isUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #isUnique()
-	 * @generated
-	 */
-	void setUnique(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Multiplicity</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multiplicity</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Multiplicity</em>' reference.
-	 * @see #setMultiplicity(IMultiplicity)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Multiplicity()
-	 * @model
-	 * @generated
-	 */
-	IMultiplicity getMultiplicity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getMultiplicity <em>Multiplicity</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multiplicity</em>' reference.
-	 * @see #getMultiplicity()
-	 * @generated
-	 */
-	void setMultiplicity(IMultiplicity value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' reference.
-	 * @see #setType(IAbstractArtifact)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIAssociationEnd_Type()
-	 * @model
-	 * @generated
-	 */
-	IAbstractArtifact getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IAssociationEnd#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(IAbstractArtifact value);
-
-} // IAssociationEnd
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IDatatypeArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IDatatypeArtifact.java
deleted file mode 100644
index f193f30..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IDatatypeArtifact.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IDatatypeArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IDatatype Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIDatatypeArtifact()
- * @model
- * @generated
- */
-public interface IDatatypeArtifact extends IAbstractArtifact {
-} // IDatatypeArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IDependencyArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IDependencyArtifact.java
deleted file mode 100644
index c2a416e..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IDependencyArtifact.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IDependencyArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IDependency Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IDependencyArtifact#getAEndType <em>AEnd Type</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IDependencyArtifact#getZEndType <em>ZEnd Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIDependencyArtifact()
- * @model
- * @generated
- */
-public interface IDependencyArtifact extends IAbstractArtifact {
-	/**
-	 * Returns the value of the '<em><b>AEnd Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>AEnd Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>AEnd Type</em>' reference.
-	 * @see #setAEndType(IType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIDependencyArtifact_AEndType()
-	 * @model required="true"
-	 * @generated
-	 */
-	IType getAEndType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IDependencyArtifact#getAEndType <em>AEnd Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>AEnd Type</em>' reference.
-	 * @see #getAEndType()
-	 * @generated
-	 */
-	void setAEndType(IType value);
-
-	/**
-	 * Returns the value of the '<em><b>ZEnd Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>ZEnd Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>ZEnd Type</em>' reference.
-	 * @see #setZEndType(IType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIDependencyArtifact_ZEndType()
-	 * @model required="true"
-	 * @generated
-	 */
-	IType getZEndType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IDependencyArtifact#getZEndType <em>ZEnd Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>ZEnd Type</em>' reference.
-	 * @see #getZEndType()
-	 * @generated
-	 */
-	void setZEndType(IType value);
-
-} // IDependencyArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEntityMethodFlavorDetails.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEntityMethodFlavorDetails.java
deleted file mode 100644
index 24c7ea1..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEntityMethodFlavorDetails.java
+++ /dev/null
@@ -1,193 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IEntityMethodFlavorDetails.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-import org.eclipse.tigerstripe.metamodel.extensions.ossj.EEntityMethodFlavorFlag;
-import org.eclipse.tigerstripe.metamodel.extensions.ossj.EMethodType;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IEntity Method Flavor Details</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getComment <em>Comment</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getFlag <em>Flag</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getExceptions <em>Exceptions</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getMethod <em>Method</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getFlavor <em>Flavor</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getMethodType <em>Method Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails()
- * @model
- * @generated
- */
-public interface IEntityMethodFlavorDetails extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getComment <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Flag</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.extensions.ossj.EEntityMethodFlavorFlag}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Flag</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Flag</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.extensions.ossj.EEntityMethodFlavorFlag
-	 * @see #setFlag(EEntityMethodFlavorFlag)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails_Flag()
-	 * @model
-	 * @generated
-	 */
-	EEntityMethodFlavorFlag getFlag();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getFlag <em>Flag</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Flag</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.extensions.ossj.EEntityMethodFlavorFlag
-	 * @see #getFlag()
-	 * @generated
-	 */
-	void setFlag(EEntityMethodFlavorFlag value);
-
-	/**
-	 * Returns the value of the '<em><b>Exceptions</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exceptions</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exceptions</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails_Exceptions()
-	 * @model
-	 * @generated
-	 */
-	EList<IType> getExceptions();
-
-	/**
-	 * Returns the value of the '<em><b>Method</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method</em>' reference.
-	 * @see #setMethod(IMethod)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails_Method()
-	 * @model
-	 * @generated
-	 */
-	IMethod getMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getMethod <em>Method</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method</em>' reference.
-	 * @see #getMethod()
-	 * @generated
-	 */
-	void setMethod(IMethod value);
-
-	/**
-	 * Returns the value of the '<em><b>Flavor</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.OssjEntityMethodFlavor}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Flavor</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Flavor</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.OssjEntityMethodFlavor
-	 * @see #setFlavor(OssjEntityMethodFlavor)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails_Flavor()
-	 * @model
-	 * @generated
-	 */
-	OssjEntityMethodFlavor getFlavor();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getFlavor <em>Flavor</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Flavor</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.OssjEntityMethodFlavor
-	 * @see #getFlavor()
-	 * @generated
-	 */
-	void setFlavor(OssjEntityMethodFlavor value);
-
-	/**
-	 * Returns the value of the '<em><b>Method Type</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.extensions.ossj.EMethodType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Type</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.extensions.ossj.EMethodType
-	 * @see #setMethodType(EMethodType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEntityMethodFlavorDetails_MethodType()
-	 * @model
-	 * @generated
-	 */
-	EMethodType getMethodType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails#getMethodType <em>Method Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Type</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.extensions.ossj.EMethodType
-	 * @see #getMethodType()
-	 * @generated
-	 */
-	void setMethodType(EMethodType value);
-
-} // IEntityMethodFlavorDetails
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEnumArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEnumArtifact.java
deleted file mode 100644
index c27feb9..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEnumArtifact.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IEnumArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IEnum Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IEnumArtifact#getBaseType <em>Base Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEnumArtifact()
- * @model
- * @generated
- */
-public interface IEnumArtifact extends IAbstractArtifact {
-	/**
-	 * Returns the value of the '<em><b>Base Type</b></em>' attribute.
-	 * The default value is <code>"int"</code>.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Base Type</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Base Type</em>' attribute.
-	 * @see #setBaseType(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEnumArtifact_BaseType()
-	 * @model default="int"
-	 * @generated
-	 */
-	String getBaseType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IEnumArtifact#getBaseType <em>Base Type</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Base Type</em>' attribute.
-	 * @see #getBaseType()
-	 * @generated
-	 */
-	void setBaseType(String value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getMaxLiteral();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getMinLiteral();
-
-} // IEnumArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEventArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEventArtifact.java
deleted file mode 100644
index 503a2a6..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IEventArtifact.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IEventArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IEvent Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIEventArtifact()
- * @model
- * @generated
- */
-public interface IEventArtifact extends IAbstractArtifact {
-} // IEventArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IExceptionArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IExceptionArtifact.java
deleted file mode 100644
index bc5379b..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IExceptionArtifact.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IExceptionArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IException Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIExceptionArtifact()
- * @model
- * @generated
- */
-public interface IExceptionArtifact extends IAbstractArtifact {
-} // IExceptionArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IField.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IField.java
deleted file mode 100644
index d6db7a3..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IField.java
+++ /dev/null
@@ -1,245 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IField.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IField</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#isOptional <em>Optional</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#isReadOnly <em>Read Only</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#isOrdered <em>Ordered</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#isUnique <em>Unique</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#getType <em>Type</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#getDefaultValue <em>Default Value</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IField#getRefBy <em>Ref By</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField()
- * @model
- * @generated
- */
-public interface IField extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_Optional()
-	 * @model
-	 * @generated
-	 */
-	boolean isOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#isOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #isOptional()
-	 * @generated
-	 */
-	void setOptional(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Read Only</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Read Only</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Read Only</em>' attribute.
-	 * @see #setReadOnly(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_ReadOnly()
-	 * @model
-	 * @generated
-	 */
-	boolean isReadOnly();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#isReadOnly <em>Read Only</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Read Only</em>' attribute.
-	 * @see #isReadOnly()
-	 * @generated
-	 */
-	void setReadOnly(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ordered</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ordered</em>' attribute.
-	 * @see #setOrdered(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_Ordered()
-	 * @model
-	 * @generated
-	 */
-	boolean isOrdered();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#isOrdered <em>Ordered</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ordered</em>' attribute.
-	 * @see #isOrdered()
-	 * @generated
-	 */
-	void setOrdered(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_Unique()
-	 * @model
-	 * @generated
-	 */
-	boolean isUnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#isUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #isUnique()
-	 * @generated
-	 */
-	void setUnique(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' reference.
-	 * @see #setType(IType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_Type()
-	 * @model
-	 * @generated
-	 */
-	IType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(IType value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Value</em>' attribute.
-	 * @see #isSetDefaultValue()
-	 * @see #unsetDefaultValue()
-	 * @see #setDefaultValue(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_DefaultValue()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getDefaultValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#getDefaultValue <em>Default Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Value</em>' attribute.
-	 * @see #isSetDefaultValue()
-	 * @see #unsetDefaultValue()
-	 * @see #getDefaultValue()
-	 * @generated
-	 */
-	void setDefaultValue(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#getDefaultValue <em>Default Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDefaultValue()
-	 * @see #getDefaultValue()
-	 * @see #setDefaultValue(String)
-	 * @generated
-	 */
-	void unsetDefaultValue();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#getDefaultValue <em>Default Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Default Value</em>' attribute is set.
-	 * @see #unsetDefaultValue()
-	 * @see #getDefaultValue()
-	 * @see #setDefaultValue(String)
-	 * @generated
-	 */
-	boolean isSetDefaultValue();
-
-	/**
-	 * Returns the value of the '<em><b>Ref By</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.ERefByEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ref By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ref By</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.ERefByEnum
-	 * @see #setRefBy(ERefByEnum)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIField_RefBy()
-	 * @model
-	 * @generated
-	 */
-	ERefByEnum getRefBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IField#getRefBy <em>Ref By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ref By</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.ERefByEnum
-	 * @see #getRefBy()
-	 * @generated
-	 */
-	void setRefBy(ERefByEnum value);
-
-} // IField
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ILiteral.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ILiteral.java
deleted file mode 100644
index 82c585b..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ILiteral.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ILiteral.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ILiteral</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.ILiteral#getValue <em>Value</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.ILiteral#getType <em>Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getILiteral()
- * @model
- * @generated
- */
-public interface ILiteral extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getILiteral_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.ILiteral#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Type</em>' reference.
-	 * @see #setType(IType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getILiteral_Type()
-	 * @model
-	 * @generated
-	 */
-	IType getType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.ILiteral#getType <em>Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Type</em>' reference.
-	 * @see #getType()
-	 * @generated
-	 */
-	void setType(IType value);
-
-} // ILiteral
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IManagedEntityArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IManagedEntityArtifact.java
deleted file mode 100644
index d5d524a..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IManagedEntityArtifact.java
+++ /dev/null
@@ -1,53 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IManagedEntityArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IManaged Entity Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IManagedEntityArtifact#getPrimaryKey <em>Primary Key</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIManagedEntityArtifact()
- * @model
- * @generated
- */
-public interface IManagedEntityArtifact extends IAbstractArtifact {
-	/**
-	 * Returns the value of the '<em><b>Primary Key</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Primary Key</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Primary Key</em>' attribute.
-	 * @see #setPrimaryKey(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIManagedEntityArtifact_PrimaryKey()
-	 * @model
-	 * @generated
-	 */
-	String getPrimaryKey();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IManagedEntityArtifact#getPrimaryKey <em>Primary Key</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Primary Key</em>' attribute.
-	 * @see #getPrimaryKey()
-	 * @generated
-	 */
-	void setPrimaryKey(String value);
-
-} // IManagedEntityArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IMethod.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IMethod.java
deleted file mode 100644
index f4d88da..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IMethod.java
+++ /dev/null
@@ -1,446 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IMethod.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMethod</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getArguments <em>Arguments</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getReturnType <em>Return Type</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isAbstract <em>Abstract</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isOrdered <em>Ordered</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isUnique <em>Unique</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isOptional <em>Optional</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getExceptions <em>Exceptions</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isVoid <em>Void</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isIteratorReturn <em>Iterator Return</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getReturnRefBy <em>Return Ref By</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#isInstanceMethod <em>Instance Method</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getDefaultReturnValue <em>Default Return Value</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getMethodReturnName <em>Method Return Name</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getReturnStereotypeInstances <em>Return Stereotype Instances</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMethod#getEntityMethodFlavorDetails <em>Entity Method Flavor Details</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod()
- * @model
- * @generated
- */
-public interface IMethod extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Arguments</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IArgument}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Arguments</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Arguments</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Arguments()
-	 * @model
-	 * @generated
-	 */
-	EList<IArgument> getArguments();
-
-	/**
-	 * Returns the value of the '<em><b>Return Type</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Type</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Type</em>' reference.
-	 * @see #setReturnType(IType)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_ReturnType()
-	 * @model
-	 * @generated
-	 */
-	IType getReturnType();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#getReturnType <em>Return Type</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Type</em>' reference.
-	 * @see #getReturnType()
-	 * @generated
-	 */
-	void setReturnType(IType value);
-
-	/**
-	 * Returns the value of the '<em><b>Abstract</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Abstract</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Abstract</em>' attribute.
-	 * @see #setAbstract(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Abstract()
-	 * @model
-	 * @generated
-	 */
-	boolean isAbstract();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isAbstract <em>Abstract</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Abstract</em>' attribute.
-	 * @see #isAbstract()
-	 * @generated
-	 */
-	void setAbstract(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Ordered</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Ordered</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Ordered</em>' attribute.
-	 * @see #setOrdered(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Ordered()
-	 * @model
-	 * @generated
-	 */
-	boolean isOrdered();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isOrdered <em>Ordered</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Ordered</em>' attribute.
-	 * @see #isOrdered()
-	 * @generated
-	 */
-	void setOrdered(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Unique</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Unique</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Unique</em>' attribute.
-	 * @see #setUnique(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Unique()
-	 * @model
-	 * @generated
-	 */
-	boolean isUnique();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isUnique <em>Unique</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Unique</em>' attribute.
-	 * @see #isUnique()
-	 * @generated
-	 */
-	void setUnique(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Optional</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Optional</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Optional</em>' attribute.
-	 * @see #setOptional(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Optional()
-	 * @model
-	 * @generated
-	 */
-	boolean isOptional();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isOptional <em>Optional</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Optional</em>' attribute.
-	 * @see #isOptional()
-	 * @generated
-	 */
-	void setOptional(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Exceptions</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exceptions</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exceptions</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Exceptions()
-	 * @model
-	 * @generated
-	 */
-	EList<IType> getExceptions();
-
-	/**
-	 * Returns the value of the '<em><b>Void</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Void</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Void</em>' attribute.
-	 * @see #setVoid(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_Void()
-	 * @model
-	 * @generated
-	 */
-	boolean isVoid();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isVoid <em>Void</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Void</em>' attribute.
-	 * @see #isVoid()
-	 * @generated
-	 */
-	void setVoid(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Iterator Return</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Iterator Return</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Iterator Return</em>' attribute.
-	 * @see #setIteratorReturn(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_IteratorReturn()
-	 * @model
-	 * @generated
-	 */
-	boolean isIteratorReturn();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isIteratorReturn <em>Iterator Return</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Iterator Return</em>' attribute.
-	 * @see #isIteratorReturn()
-	 * @generated
-	 */
-	void setIteratorReturn(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Return Ref By</b></em>' attribute.
-	 * The literals are from the enumeration {@link org.eclipse.tigerstripe.metamodel.ERefByEnum}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Ref By</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Ref By</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.ERefByEnum
-	 * @see #setReturnRefBy(ERefByEnum)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_ReturnRefBy()
-	 * @model
-	 * @generated
-	 */
-	ERefByEnum getReturnRefBy();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#getReturnRefBy <em>Return Ref By</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Return Ref By</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.ERefByEnum
-	 * @see #getReturnRefBy()
-	 * @generated
-	 */
-	void setReturnRefBy(ERefByEnum value);
-
-	/**
-	 * Returns the value of the '<em><b>Instance Method</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Instance Method</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Instance Method</em>' attribute.
-	 * @see #setInstanceMethod(boolean)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_InstanceMethod()
-	 * @model
-	 * @generated
-	 */
-	boolean isInstanceMethod();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#isInstanceMethod <em>Instance Method</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Instance Method</em>' attribute.
-	 * @see #isInstanceMethod()
-	 * @generated
-	 */
-	void setInstanceMethod(boolean value);
-
-	/**
-	 * Returns the value of the '<em><b>Default Return Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Default Return Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Default Return Value</em>' attribute.
-	 * @see #isSetDefaultReturnValue()
-	 * @see #unsetDefaultReturnValue()
-	 * @see #setDefaultReturnValue(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_DefaultReturnValue()
-	 * @model unsettable="true"
-	 * @generated
-	 */
-	String getDefaultReturnValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#getDefaultReturnValue <em>Default Return Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Default Return Value</em>' attribute.
-	 * @see #isSetDefaultReturnValue()
-	 * @see #unsetDefaultReturnValue()
-	 * @see #getDefaultReturnValue()
-	 * @generated
-	 */
-	void setDefaultReturnValue(String value);
-
-	/**
-	 * Unsets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#getDefaultReturnValue <em>Default Return Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see #isSetDefaultReturnValue()
-	 * @see #getDefaultReturnValue()
-	 * @see #setDefaultReturnValue(String)
-	 * @generated
-	 */
-	void unsetDefaultReturnValue();
-
-	/**
-	 * Returns whether the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#getDefaultReturnValue <em>Default Return Value</em>}' attribute is set.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return whether the value of the '<em>Default Return Value</em>' attribute is set.
-	 * @see #unsetDefaultReturnValue()
-	 * @see #getDefaultReturnValue()
-	 * @see #setDefaultReturnValue(String)
-	 * @generated
-	 */
-	boolean isSetDefaultReturnValue();
-
-	/**
-	 * Returns the value of the '<em><b>Method Return Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Method Return Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Method Return Name</em>' attribute.
-	 * @see #setMethodReturnName(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_MethodReturnName()
-	 * @model
-	 * @generated
-	 */
-	String getMethodReturnName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMethod#getMethodReturnName <em>Method Return Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Method Return Name</em>' attribute.
-	 * @see #getMethodReturnName()
-	 * @generated
-	 */
-	void setMethodReturnName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Return Stereotype Instances</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IStereotypeInstance}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Return Stereotype Instances</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Return Stereotype Instances</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_ReturnStereotypeInstances()
-	 * @model
-	 * @generated
-	 */
-	EList<IStereotypeInstance> getReturnStereotypeInstances();
-
-	/**
-	 * Returns the value of the '<em><b>Entity Method Flavor Details</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IEntityMethodFlavorDetails}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Entity Method Flavor Details</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Entity Method Flavor Details</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMethod_EntityMethodFlavorDetails()
-	 * @model
-	 * @generated
-	 */
-	EList<IEntityMethodFlavorDetails> getEntityMethodFlavorDetails();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	IEntityMethodFlavorDetails getEntityMethodFlavorDetails(OssjEntityMethodFlavor flavor);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	void setEntityMethodFlavorDetails(OssjEntityMethodFlavor flavor, IEntityMethodFlavorDetails details);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getMethodId();
-
-} // IMethod
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModel.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModel.java
deleted file mode 100644
index 4edbe34..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModel.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IModel.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IModel</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IModel#getPackages <em>Packages</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIModel()
- * @model
- * @generated
- */
-public interface IModel extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Packages</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IPackage}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Packages</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Packages</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIModel_Packages()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<IPackage> getPackages();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getAllArtifacts();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	IAbstractArtifact getArtifactByName(String fullyQualifiedName);
-
-} // IModel
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModelComponent.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModelComponent.java
deleted file mode 100644
index 38f565f..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModelComponent.java
+++ /dev/null
@@ -1,117 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IModelComponent.java,v 1.3 2008/02/28 18:05:32 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-/**
- * <!-- begin-user-doc --> A representation of the model object '<em><b>IModel Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IModelComponent#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IModelComponent#getComment <em>Comment</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IModelComponent#getVisibility <em>Visibility</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIModelComponent()
- * @model abstract="true"
- * @generated
- */
-public interface IModelComponent extends IStereotypeCapable {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear, there
-	 * really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIModelComponent_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IModelComponent#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Comment</b></em>' attribute. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Comment</em>' attribute isn't clear, there
-	 * really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Comment</em>' attribute.
-	 * @see #setComment(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIModelComponent_Comment()
-	 * @model
-	 * @generated
-	 */
-	String getComment();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IModelComponent#getComment <em>Comment</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Comment</em>' attribute.
-	 * @see #getComment()
-	 * @generated
-	 */
-	void setComment(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Visibility</b></em>' attribute. The
-	 * literals are from the enumeration
-	 * {@link org.eclipse.tigerstripe.metamodel.VisibilityEnum}. <!--
-	 * begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Visibility</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * 
-	 * @return the value of the '<em>Visibility</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.VisibilityEnum
-	 * @see #setVisibility(VisibilityEnum)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIModelComponent_Visibility()
-	 * @model
-	 * @generated
-	 */
-	VisibilityEnum getVisibility();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IModelComponent#getVisibility <em>Visibility</em>}' attribute.
-	 * <!-- begin-user-doc --> <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Visibility</em>' attribute.
-	 * @see org.eclipse.tigerstripe.metamodel.VisibilityEnum
-	 * @see #getVisibility()
-	 * @generated
-	 */
-	void setVisibility(VisibilityEnum value);
-
-	/**
-	 * Gets the metadata for this artifact type.
-	 * 
-	 * This is not an EMF method.
-	 * 
-	 */
-	public IModelComponentMetadata getMetadata();
-
-} // IModelComponent
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModelComponentMetadata.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModelComponentMetadata.java
deleted file mode 100644
index 0f230b2..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IModelComponentMetadata.java
+++ /dev/null
@@ -1,24 +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.metamodel;
-
-import java.net.URL;
-
-public interface IModelComponentMetadata {
-	public URL getIconURL();
-
-	public URL getGreyedoutIconURL();
-
-	public URL getNewIconURL();
-
-	public String getLabel();
-
-}
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IMultiplicity.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IMultiplicity.java
deleted file mode 100644
index 04ebd16..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IMultiplicity.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IMultiplicity.java,v 1.2 2008/02/28 18:05:32 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IMultiplicity</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMultiplicity#getLowerBound <em>Lower Bound</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IMultiplicity#getUpperBound <em>Upper Bound</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMultiplicity()
- * @model
- * @generated
- */
-public interface IMultiplicity extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Lower Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Lower Bound</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Lower Bound</em>' attribute.
-	 * @see #setLowerBound(int)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMultiplicity_LowerBound()
-	 * @model
-	 * @generated
-	 */
-	int getLowerBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMultiplicity#getLowerBound <em>Lower Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Lower Bound</em>' attribute.
-	 * @see #getLowerBound()
-	 * @generated
-	 */
-	void setLowerBound(int value);
-
-	/**
-	 * Returns the value of the '<em><b>Upper Bound</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Upper Bound</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Upper Bound</em>' attribute.
-	 * @see #setUpperBound(int)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIMultiplicity_UpperBound()
-	 * @model
-	 * @generated
-	 */
-	int getUpperBound();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IMultiplicity#getUpperBound <em>Upper Bound</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Upper Bound</em>' attribute.
-	 * @see #getUpperBound()
-	 * @generated
-	 */
-	void setUpperBound(int value);
-
-} // IMultiplicity
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IPackage.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IPackage.java
deleted file mode 100644
index a11d5e2..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IPackage.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IPackage.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IPackage</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IPackage#getArtifacts <em>Artifacts</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IPackage#getName <em>Name</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIPackage()
- * @model
- * @generated
- */
-public interface IPackage extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Artifacts</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IAbstractArtifact}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Artifacts</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Artifacts</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIPackage_Artifacts()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<IAbstractArtifact> getArtifacts();
-
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIPackage_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IPackage#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-} // IPackage
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IPrimitiveType.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IPrimitiveType.java
deleted file mode 100644
index c3330e2..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IPrimitiveType.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IPrimitiveType.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IPrimitive Type</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIPrimitiveType()
- * @model
- * @generated
- */
-public interface IPrimitiveType extends IAbstractArtifact {
-} // IPrimitiveType
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IQualifiedNamedComponent.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IQualifiedNamedComponent.java
deleted file mode 100644
index 2bc86cb..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IQualifiedNamedComponent.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IQualifiedNamedComponent.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IQualified Named Component</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IQualifiedNamedComponent#getPackage <em>Package</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIQualifiedNamedComponent()
- * @model abstract="true"
- * @generated
- */
-public interface IQualifiedNamedComponent extends IModelComponent {
-	/**
-	 * Returns the value of the '<em><b>Package</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Package</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Package</em>' attribute.
-	 * @see #setPackage(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIQualifiedNamedComponent_Package()
-	 * @model
-	 * @generated
-	 */
-	String getPackage();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IQualifiedNamedComponent#getPackage <em>Package</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Package</em>' attribute.
-	 * @see #getPackage()
-	 * @generated
-	 */
-	void setPackage(String value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getFullyQualifiedName();
-
-} // IQualifiedNamedComponent
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IQueryArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IQueryArtifact.java
deleted file mode 100644
index acf80bd..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IQueryArtifact.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IQueryArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IQuery Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IQueryArtifact#getReturnedType <em>Returned Type</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIQueryArtifact()
- * @model
- * @generated
- */
-public interface IQueryArtifact extends IAbstractArtifact {
-	/**
-	 * Returns the value of the '<em><b>Returned Type</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IType}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Returned Type</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Returned Type</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIQueryArtifact_ReturnedType()
-	 * @model
-	 * @generated
-	 */
-	EList<IType> getReturnedType();
-
-} // IQueryArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ISessionArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ISessionArtifact.java
deleted file mode 100644
index 3cef2e3..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/ISessionArtifact.java
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: ISessionArtifact.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.tigerstripe.metamodel.extensions.ossj.IManagedEntityDetails;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>ISession Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.ISessionArtifact#getManagedEntities <em>Managed Entities</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.ISessionArtifact#getEmittedNotifications <em>Emitted Notifications</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.ISessionArtifact#getSupportedNamedQueries <em>Supported Named Queries</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.ISessionArtifact#getExposedUpdateProcedures <em>Exposed Update Procedures</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getISessionArtifact()
- * @model
- * @generated
- */
-public interface ISessionArtifact extends IAbstractArtifact {
-	/**
-	 * Returns the value of the '<em><b>Managed Entities</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.extensions.ossj.IManagedEntityDetails}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Managed Entities</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Managed Entities</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getISessionArtifact_ManagedEntities()
-	 * @model
-	 * @generated
-	 */
-	EList<IManagedEntityDetails> getManagedEntities();
-
-	/**
-	 * Returns the value of the '<em><b>Emitted Notifications</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IEventArtifact}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Emitted Notifications</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Emitted Notifications</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getISessionArtifact_EmittedNotifications()
-	 * @model
-	 * @generated
-	 */
-	EList<IEventArtifact> getEmittedNotifications();
-
-	/**
-	 * Returns the value of the '<em><b>Supported Named Queries</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IQueryArtifact}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Supported Named Queries</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Supported Named Queries</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getISessionArtifact_SupportedNamedQueries()
-	 * @model
-	 * @generated
-	 */
-	EList<IQueryArtifact> getSupportedNamedQueries();
-
-	/**
-	 * Returns the value of the '<em><b>Exposed Update Procedures</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IUpdateProcedureArtifact}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Exposed Update Procedures</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Exposed Update Procedures</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getISessionArtifact_ExposedUpdateProcedures()
-	 * @model
-	 * @generated
-	 */
-	EList<IUpdateProcedureArtifact> getExposedUpdateProcedures();
-
-} // ISessionArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeAttributeValue.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeAttributeValue.java
deleted file mode 100644
index 4fd3b8c..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeAttributeValue.java
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IStereotypeAttributeValue.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IStereotype Attribute Value</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IStereotypeAttributeValue#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IStereotypeAttributeValue#getValue <em>Value</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeAttributeValue()
- * @model
- * @generated
- */
-public interface IStereotypeAttributeValue extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeAttributeValue_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IStereotypeAttributeValue#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Value</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Value</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Value</em>' attribute.
-	 * @see #setValue(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeAttributeValue_Value()
-	 * @model
-	 * @generated
-	 */
-	String getValue();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IStereotypeAttributeValue#getValue <em>Value</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Value</em>' attribute.
-	 * @see #getValue()
-	 * @generated
-	 */
-	void setValue(String value);
-
-} // IStereotypeAttributeValue
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeCapable.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeCapable.java
deleted file mode 100644
index b65a848..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeCapable.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IStereotypeCapable.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IStereotype Capable</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IStereotypeCapable#getStereotypeInstances <em>Stereotype Instances</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeCapable()
- * @model
- * @generated
- */
-public interface IStereotypeCapable extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Stereotype Instances</b></em>' reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IStereotypeInstance}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Stereotype Instances</em>' reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Stereotype Instances</em>' reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeCapable_StereotypeInstances()
-	 * @model
-	 * @generated
-	 */
-	EList<IStereotypeInstance> getStereotypeInstances();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	IStereotypeInstance getStereotypeInstanceByName(String name);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model
-	 * @generated
-	 */
-	boolean hasStereotypeInstance(String name);
-
-} // IStereotypeCapable
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeInstance.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeInstance.java
deleted file mode 100644
index 491f893..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IStereotypeInstance.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IStereotypeInstance.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.common.util.EList;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IStereotype Instance</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IStereotypeInstance#getName <em>Name</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IStereotypeInstance#getAttributeValues <em>Attribute Values</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeInstance()
- * @model
- * @generated
- */
-public interface IStereotypeInstance extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Name</em>' attribute.
-	 * @see #setName(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeInstance_Name()
-	 * @model
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IStereotypeInstance#getName <em>Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Name</em>' attribute.
-	 * @see #getName()
-	 * @generated
-	 */
-	void setName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Attribute Values</b></em>' containment reference list.
-	 * The list contents are of type {@link org.eclipse.tigerstripe.metamodel.IStereotypeAttributeValue}.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Attribute Values</em>' containment reference list isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Attribute Values</em>' containment reference list.
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIStereotypeInstance_AttributeValues()
-	 * @model containment="true"
-	 * @generated
-	 */
-	EList<IStereotypeAttributeValue> getAttributeValues();
-
-} // IStereotypeInstance
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IType.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IType.java
deleted file mode 100644
index b291a2d..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IType.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IType.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.ecore.EObject;
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IType</b></em>'.
- * <!-- end-user-doc -->
- *
- * <p>
- * The following features are supported:
- * <ul>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IType#getFullyQualifiedName <em>Fully Qualified Name</em>}</li>
- *   <li>{@link org.eclipse.tigerstripe.metamodel.IType#getMultiplicity <em>Multiplicity</em>}</li>
- * </ul>
- * </p>
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIType()
- * @model
- * @generated
- */
-public interface IType extends EObject {
-	/**
-	 * Returns the value of the '<em><b>Fully Qualified Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Fully Qualified Name</em>' attribute isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Fully Qualified Name</em>' attribute.
-	 * @see #setFullyQualifiedName(String)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIType_FullyQualifiedName()
-	 * @model
-	 * @generated
-	 */
-	String getFullyQualifiedName();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IType#getFullyQualifiedName <em>Fully Qualified Name</em>}' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Fully Qualified Name</em>' attribute.
-	 * @see #getFullyQualifiedName()
-	 * @generated
-	 */
-	void setFullyQualifiedName(String value);
-
-	/**
-	 * Returns the value of the '<em><b>Multiplicity</b></em>' reference.
-	 * <!-- begin-user-doc -->
-	 * <p>
-	 * If the meaning of the '<em>Multiplicity</em>' reference isn't clear,
-	 * there really should be more of a description here...
-	 * </p>
-	 * <!-- end-user-doc -->
-	 * @return the value of the '<em>Multiplicity</em>' reference.
-	 * @see #setMultiplicity(IMultiplicity)
-	 * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIType_Multiplicity()
-	 * @model
-	 * @generated
-	 */
-	IMultiplicity getMultiplicity();
-
-	/**
-	 * Sets the value of the '{@link org.eclipse.tigerstripe.metamodel.IType#getMultiplicity <em>Multiplicity</em>}' reference.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @param value the new value of the '<em>Multiplicity</em>' reference.
-	 * @see #getMultiplicity()
-	 * @generated
-	 */
-	void setMultiplicity(IMultiplicity value);
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getName();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	String getPackage();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	boolean isArtifact();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	boolean isDatatype();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	boolean isEntityType();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	boolean isEnum();
-
-	/**
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @model kind="operation"
-	 * @generated
-	 */
-	boolean isPrimitive();
-
-} // IType
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IUpdateProcedureArtifact.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IUpdateProcedureArtifact.java
deleted file mode 100644
index 2f9a259..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/IUpdateProcedureArtifact.java
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: IUpdateProcedureArtifact.java,v 1.2 2008/05/22 18:26:30 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-
-/**
- * <!-- begin-user-doc -->
- * A representation of the model object '<em><b>IUpdate Procedure Artifact</b></em>'.
- * <!-- end-user-doc -->
- *
- *
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage#getIUpdateProcedureArtifact()
- * @model
- * @generated
- */
-public interface IUpdateProcedureArtifact extends IAbstractArtifact {
-} // IUpdateProcedureArtifact
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/MetamodelFactory.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/MetamodelFactory.java
deleted file mode 100644
index b167d76..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/MetamodelFactory.java
+++ /dev/null
@@ -1,262 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetamodelFactory.java,v 1.1 2008/02/14 23:58:00 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.ecore.EFactory;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Factory</b> for the model.
- * It provides a create method for each non-abstract class of the model.
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.metamodel.MetamodelPackage
- * @generated
- */
-public interface MetamodelFactory extends EFactory {
-	/**
-	 * The singleton instance of the factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MetamodelFactory eINSTANCE = org.eclipse.tigerstripe.metamodel.impl.MetamodelFactoryImpl.init();
-
-	/**
-	 * Returns a new object of class '<em>IPrimitive Type</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IPrimitive Type</em>'.
-	 * @generated
-	 */
-	IPrimitiveType createIPrimitiveType();
-
-	/**
-	 * Returns a new object of class '<em>IManaged Entity Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IManaged Entity Artifact</em>'.
-	 * @generated
-	 */
-	IManagedEntityArtifact createIManagedEntityArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IDatatype Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IDatatype Artifact</em>'.
-	 * @generated
-	 */
-	IDatatypeArtifact createIDatatypeArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IException Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IException Artifact</em>'.
-	 * @generated
-	 */
-	IExceptionArtifact createIExceptionArtifact();
-
-	/**
-	 * Returns a new object of class '<em>ISession Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>ISession Artifact</em>'.
-	 * @generated
-	 */
-	ISessionArtifact createISessionArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IQuery Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IQuery Artifact</em>'.
-	 * @generated
-	 */
-	IQueryArtifact createIQueryArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IUpdate Procedure Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IUpdate Procedure Artifact</em>'.
-	 * @generated
-	 */
-	IUpdateProcedureArtifact createIUpdateProcedureArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IEvent Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IEvent Artifact</em>'.
-	 * @generated
-	 */
-	IEventArtifact createIEventArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IAssociation Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IAssociation Artifact</em>'.
-	 * @generated
-	 */
-	IAssociationArtifact createIAssociationArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IAssociation Class Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IAssociation Class Artifact</em>'.
-	 * @generated
-	 */
-	IAssociationClassArtifact createIAssociationClassArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IDependency Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IDependency Artifact</em>'.
-	 * @generated
-	 */
-	IDependencyArtifact createIDependencyArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IEnum Artifact</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IEnum Artifact</em>'.
-	 * @generated
-	 */
-	IEnumArtifact createIEnumArtifact();
-
-	/**
-	 * Returns a new object of class '<em>IField</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IField</em>'.
-	 * @generated
-	 */
-	IField createIField();
-
-	/**
-	 * Returns a new object of class '<em>IMethod</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IMethod</em>'.
-	 * @generated
-	 */
-	IMethod createIMethod();
-
-	/**
-	 * Returns a new object of class '<em>ILiteral</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>ILiteral</em>'.
-	 * @generated
-	 */
-	ILiteral createILiteral();
-
-	/**
-	 * Returns a new object of class '<em>IType</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IType</em>'.
-	 * @generated
-	 */
-	IType createIType();
-
-	/**
-	 * Returns a new object of class '<em>IAssociation End</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IAssociation End</em>'.
-	 * @generated
-	 */
-	IAssociationEnd createIAssociationEnd();
-
-	/**
-	 * Returns a new object of class '<em>IArgument</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IArgument</em>'.
-	 * @generated
-	 */
-	IArgument createIArgument();
-
-	/**
-	 * Returns a new object of class '<em>IModel</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IModel</em>'.
-	 * @generated
-	 */
-	IModel createIModel();
-
-	/**
-	 * Returns a new object of class '<em>IPackage</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IPackage</em>'.
-	 * @generated
-	 */
-	IPackage createIPackage();
-
-	/**
-	 * Returns a new object of class '<em>IStereotype Capable</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IStereotype Capable</em>'.
-	 * @generated
-	 */
-	IStereotypeCapable createIStereotypeCapable();
-
-	/**
-	 * Returns a new object of class '<em>IStereotype Instance</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IStereotype Instance</em>'.
-	 * @generated
-	 */
-	IStereotypeInstance createIStereotypeInstance();
-
-	/**
-	 * Returns a new object of class '<em>IStereotype Attribute Value</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IStereotype Attribute Value</em>'.
-	 * @generated
-	 */
-	IStereotypeAttributeValue createIStereotypeAttributeValue();
-
-	/**
-	 * Returns a new object of class '<em>IEntity Method Flavor Details</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IEntity Method Flavor Details</em>'.
-	 * @generated
-	 */
-	IEntityMethodFlavorDetails createIEntityMethodFlavorDetails();
-
-	/**
-	 * Returns a new object of class '<em>IMultiplicity</em>'.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return a new object of class '<em>IMultiplicity</em>'.
-	 * @generated
-	 */
-	IMultiplicity createIMultiplicity();
-
-	/**
-	 * Returns the package supported by this factory.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @return the package supported by this factory.
-	 * @generated
-	 */
-	MetamodelPackage getMetamodelPackage();
-
-} //MetamodelFactory
diff --git a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/MetamodelPackage.java b/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/MetamodelPackage.java
deleted file mode 100644
index eee290b..0000000
--- a/plugins/org.eclipse.tigerstripe.metamodel/src/org/eclipse/tigerstripe/metamodel/MetamodelPackage.java
+++ /dev/null
@@ -1,5086 +0,0 @@
-/**
- * <copyright>
- * </copyright>
- *
- * $Id: MetamodelPackage.java,v 1.2 2008/02/28 18:05:32 edillon Exp $
- */
-package org.eclipse.tigerstripe.metamodel;
-
-import org.eclipse.emf.ecore.EAttribute;
-import org.eclipse.emf.ecore.EClass;
-import org.eclipse.emf.ecore.EEnum;
-import org.eclipse.emf.ecore.EPackage;
-import org.eclipse.emf.ecore.EReference;
-
-/**
- * <!-- begin-user-doc -->
- * The <b>Package</b> for the model.
- * It contains accessors for the meta objects to represent
- * <ul>
- *   <li>each class,</li>
- *   <li>each feature of each class,</li>
- *   <li>each enum,</li>
- *   <li>and each data type</li>
- * </ul>
- * <!-- end-user-doc -->
- * @see org.eclipse.tigerstripe.metamodel.MetamodelFactory
- * @model kind="package"
- * @generated
- */
-public interface MetamodelPackage extends EPackage {
-	/**
-	 * The package name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNAME = "metamodel";
-
-	/**
-	 * The package namespace URI.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_URI = "tigerstripe";
-
-	/**
-	 * The package namespace name.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	String eNS_PREFIX = "ts";
-
-	/**
-	 * The singleton instance of the package.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 */
-	MetamodelPackage eINSTANCE = org.eclipse.tigerstripe.metamodel.impl.MetamodelPackageImpl.init();
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.metamodel.impl.IStereotypeCapableImpl <em>IStereotype Capable</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.metamodel.impl.IStereotypeCapableImpl
-	 * @see org.eclipse.tigerstripe.metamodel.impl.MetamodelPackageImpl#getIStereotypeCapable()
-	 * @generated
-	 */
-	int ISTEREOTYPE_CAPABLE = 23;
-
-	/**
-	 * The feature id for the '<em><b>Stereotype Instances</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTEREOTYPE_CAPABLE__STEREOTYPE_INSTANCES = 0;
-
-	/**
-	 * The number of structural features of the '<em>IStereotype Capable</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int ISTEREOTYPE_CAPABLE_FEATURE_COUNT = 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.metamodel.impl.IModelComponentImpl <em>IModel Component</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.metamodel.impl.IModelComponentImpl
-	 * @see org.eclipse.tigerstripe.metamodel.impl.MetamodelPackageImpl#getIModelComponent()
-	 * @generated
-	 */
-	int IMODEL_COMPONENT = 16;
-
-	/**
-	 * The feature id for the '<em><b>Stereotype Instances</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMODEL_COMPONENT__STEREOTYPE_INSTANCES = ISTEREOTYPE_CAPABLE__STEREOTYPE_INSTANCES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMODEL_COMPONENT__NAME = ISTEREOTYPE_CAPABLE_FEATURE_COUNT + 0;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMODEL_COMPONENT__COMMENT = ISTEREOTYPE_CAPABLE_FEATURE_COUNT + 1;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMODEL_COMPONENT__VISIBILITY = ISTEREOTYPE_CAPABLE_FEATURE_COUNT + 2;
-
-	/**
-	 * The number of structural features of the '<em>IModel Component</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IMODEL_COMPONENT_FEATURE_COUNT = ISTEREOTYPE_CAPABLE_FEATURE_COUNT + 3;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.metamodel.impl.IQualifiedNamedComponentImpl <em>IQualified Named Component</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.metamodel.impl.IQualifiedNamedComponentImpl
-	 * @see org.eclipse.tigerstripe.metamodel.impl.MetamodelPackageImpl#getIQualifiedNamedComponent()
-	 * @generated
-	 */
-	int IQUALIFIED_NAMED_COMPONENT = 17;
-
-	/**
-	 * The feature id for the '<em><b>Stereotype Instances</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IQUALIFIED_NAMED_COMPONENT__STEREOTYPE_INSTANCES = IMODEL_COMPONENT__STEREOTYPE_INSTANCES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IQUALIFIED_NAMED_COMPONENT__NAME = IMODEL_COMPONENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IQUALIFIED_NAMED_COMPONENT__COMMENT = IMODEL_COMPONENT__COMMENT;
-
-	/**
-	 * The feature id for the '<em><b>Visibility</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IQUALIFIED_NAMED_COMPONENT__VISIBILITY = IMODEL_COMPONENT__VISIBILITY;
-
-	/**
-	 * The feature id for the '<em><b>Package</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IQUALIFIED_NAMED_COMPONENT__PACKAGE = IMODEL_COMPONENT_FEATURE_COUNT + 0;
-
-	/**
-	 * The number of structural features of the '<em>IQualified Named Component</em>' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IQUALIFIED_NAMED_COMPONENT_FEATURE_COUNT = IMODEL_COMPONENT_FEATURE_COUNT + 1;
-
-	/**
-	 * The meta object id for the '{@link org.eclipse.tigerstripe.metamodel.impl.IAbstractArtifactImpl <em>IAbstract Artifact</em>}' class.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @see org.eclipse.tigerstripe.metamodel.impl.IAbstractArtifactImpl
-	 * @see org.eclipse.tigerstripe.metamodel.impl.MetamodelPackageImpl#getIAbstractArtifact()
-	 * @generated
-	 */
-	int IABSTRACT_ARTIFACT = 0;
-
-	/**
-	 * The feature id for the '<em><b>Stereotype Instances</b></em>' reference list.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IABSTRACT_ARTIFACT__STEREOTYPE_INSTANCES = IQUALIFIED_NAMED_COMPONENT__STEREOTYPE_INSTANCES;
-
-	/**
-	 * The feature id for the '<em><b>Name</b></em>' attribute.
-	 * <!-- begin-user-doc -->
-	 * <!-- end-user-doc -->
-	 * @generated
-	 * @ordered
-	 */
-	int IABSTRACT_ARTIFACT__NAME = IQUALIFIED_NAMED_COMPONENT__NAME;
-
-	/**
-	 * The feature id for the '<em><b>Comment</b></em>' attribute.
-	 * <!-- be