[553425] Refactor Facet Plugins
diff --git a/org.eclipse.modisco.facet.common.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.common.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.common.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.common.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.common.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.common.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.common.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.common.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.common.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.common.core/.project b/plugins/facet/org.eclipse.modisco.facet.common.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.common.core/.project
diff --git a/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.runtime.prefs b/plugins/facet/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.runtime.prefs
rename to plugins/facet/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.common.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.common.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.common.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.common.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.common.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.common.core/README.txt b/plugins/facet/org.eclipse.modisco.facet.common.core/README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/README.txt
rename to plugins/facet/org.eclipse.modisco.facet.common.core/README.txt
diff --git a/org.eclipse.modisco.facet.common.core/about.html b/plugins/facet/org.eclipse.modisco.facet.common.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.common.core/about.html
diff --git a/org.eclipse.modisco.facet.common.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.common.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.common.core/build.properties
diff --git a/org.eclipse.modisco.facet.common.core/modeling32.png b/plugins/facet/org.eclipse.modisco.facet.common.core/modeling32.png
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/modeling32.png
rename to plugins/facet/org.eclipse.modisco.facet.common.core/modeling32.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/utils/StringMatcher.java b/plugins/facet/org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/utils/StringMatcher.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/utils/StringMatcher.java
rename to plugins/facet/org.eclipse.modisco.facet.common.core/src/org/eclipse/modisco/facet/common/core/internal/utils/StringMatcher.java
diff --git a/org.eclipse.modisco.facet.common.ui/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.common.ui/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/.checkstyle
diff --git a/org.eclipse.modisco.facet.common.ui/.classpath b/plugins/facet/org.eclipse.modisco.facet.common.ui/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.common.ui/.gitignore b/plugins/facet/org.eclipse.modisco.facet.common.ui/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.common.ui/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.common.ui/.project b/plugins/facet/org.eclipse.modisco.facet.common.ui/.project
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/.project
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/.project
diff --git a/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.runtime.prefs b/plugins/facet/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.runtime.prefs
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.common.ui/API.README.txt b/plugins/facet/org.eclipse.modisco.facet.common.ui/API.README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/API.README.txt
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/API.README.txt
diff --git a/org.eclipse.modisco.facet.common.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.common.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.common.ui/about.html b/plugins/facet/org.eclipse.modisco.facet.common.ui/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/about.html
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/about.html
diff --git a/org.eclipse.modisco.facet.common.ui/build.properties b/plugins/facet/org.eclipse.modisco.facet.common.ui/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/build.properties
diff --git a/org.eclipse.modisco.facet.common.ui/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.common.ui/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/plugin.xml
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/PersistableColumn.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/PersistableColumn.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/PersistableColumn.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/PersistableColumn.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/Column.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/Column.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/Column.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/Column.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTable.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTable.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTable.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTable.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTree.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTree.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTree.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableTree.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidget.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidget.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/SortableWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TableColumn.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TableColumn.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TableColumn.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TableColumn.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TreeColumn.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TreeColumn.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TreeColumn.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/controls/wrappers/TreeColumn.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IColumnDescription.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IColumnDescription.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IColumnDescription.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IColumnDescription.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IElementsViewFactory.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IElementsViewFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IElementsViewFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/exported/views/IElementsViewFactory.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/preference/pages/EmfFacetRootPreferencePage.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/AbstractTreeView.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/AbstractTreeView.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/AbstractTreeView.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/AbstractTreeView.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsView.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsView.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsView.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsView.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsViewFactory.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsViewFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsViewFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/views/ElementsViewFactory.java
diff --git a/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java b/plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java
similarity index 100%
rename from org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java
rename to plugins/facet/org.eclipse.modisco.facet.common.ui/src/org/eclipse/modisco/facet/common/ui/internal/widgets/AnywhereFilterMatcher.java
diff --git a/org.eclipse.modisco.facet.custom.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.custom.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.custom.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.custom.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.custom.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.custom.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.custom.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.custom.core/.pmd b/plugins/facet/org.eclipse.modisco.facet.custom.core/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/.pmd
diff --git a/org.eclipse.modisco.facet.custom.core/.project b/plugins/facet/org.eclipse.modisco.facet.custom.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/.project
diff --git a/org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.custom.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.custom.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.custom.core/about.html b/plugins/facet/org.eclipse.modisco.facet.custom.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/about.html
diff --git a/org.eclipse.modisco.facet.custom.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.custom.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/build.properties
diff --git a/org.eclipse.modisco.facet.custom.core/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.custom.core/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/plugin.xml
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManager.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationCatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManager.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationManagerProvider.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManager.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/ICustomizationPropertiesCatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/exception/CustomizationException.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/exception/CustomizationException.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/exception/CustomizationException.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/exception/CustomizationException.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManager.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationCatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManager.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationManagerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManager.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationPropertiesCatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/CustomizationsDelegatingList.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exception/CustomizationCatalogRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exception/CustomizationCatalogRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exception/CustomizationCatalogRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exception/CustomizationCatalogRuntimeException.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/Constants.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/Constants.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/Constants.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/Constants.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/CustomizationUtils.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/CustomizationUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/CustomizationUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/exported/CustomizationUtils.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.core/src/org/eclipse/modisco/facet/custom/core/internal/query/SwitchQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/.classpath b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.gitignore b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.custom.metamodel/.project b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.project
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/.project
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.project
diff --git a/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.settings/.api_filters
diff --git a/org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.custom.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.custom.metamodel/about.html b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/about.html
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/about.html
diff --git a/org.eclipse.modisco.facet.custom.metamodel/build.properties b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/build.properties
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/catalog-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom_main.ecorediag b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_main.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/custom_main.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_main.ecorediag
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_primitive_types-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/custom_property_declaration.ecorediag b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_property_declaration.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/custom_property_declaration.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/custom_property_declaration.ecorediag
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.ecore b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.ecore
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/query-0.3.0.genmodel
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/model/treeproxy-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.custom.metamodel/plugin.properties b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/plugin.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/plugin.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/plugin.properties
diff --git a/org.eclipse.modisco.facet.custom.metamodel/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/plugin.xml
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IColor.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IColor.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IColor.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IColor.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IImage.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IImage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IImage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/custompt/IImage.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/CustomPackage.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/Customization.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/Customization.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/Customization.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/Customization.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/EClassCustomization.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/EClassCustomization.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/EClassCustomization.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/EClassCustomization.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementCase.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementCase.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementCase.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementCase.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementSwitchQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementSwitchQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementSwitchQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/ETypedElementSwitchQuery.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/FacetCustomization.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/FacetCustomization.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/FacetCustomization.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/FacetCustomization.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomPackageImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomizationImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomizationImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomizationImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/CustomizationImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/EClassCustomizationImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/EClassCustomizationImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/EClassCustomizationImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/EClassCustomizationImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementCaseImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementCaseImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementCaseImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementCaseImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementSwitchQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementSwitchQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementSwitchQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/ETypedElementSwitchQueryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/FacetCustomizationImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/FacetCustomizationImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/FacetCustomizationImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/impl/FacetCustomizationImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomSwitch.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custom/util/CustomSwitch.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationCatalog.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationCatalog.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationCatalog.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationCatalog.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationPropertiesCatalog.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationPropertiesCatalog.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationPropertiesCatalog.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationPropertiesCatalog.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/CustomizationcatalogPackage.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationCatalogImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationCatalogImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationCatalogImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationCatalogImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationPropertiesCatalogImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationPropertiesCatalogImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationPropertiesCatalogImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationPropertiesCatalogImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/impl/CustomizationcatalogPackageImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogSwitch.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/customizationcatalog/util/CustomizationcatalogSwitch.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Alignment.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Alignment.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Alignment.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Alignment.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/CustomptPackage.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Shadow.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Shadow.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Shadow.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/Shadow.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/custompt/impl/CustomptPackageImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EAttributeTreeElement.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EAttributeTreeElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EAttributeTreeElement.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EAttributeTreeElement.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EObjectTreeElement.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EObjectTreeElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EObjectTreeElement.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EObjectTreeElement.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EReferenceTreeElement.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EReferenceTreeElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EReferenceTreeElement.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EReferenceTreeElement.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EStructuralFeatureTreeElement.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EStructuralFeatureTreeElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EStructuralFeatureTreeElement.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/EStructuralFeatureTreeElement.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeElement.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeElement.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeElement.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/TreeproxyPackage.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EAttributeTreeElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EAttributeTreeElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EAttributeTreeElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EAttributeTreeElementImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EObjectTreeElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EObjectTreeElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EObjectTreeElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EObjectTreeElementImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EReferenceTreeElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EReferenceTreeElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EReferenceTreeElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EReferenceTreeElementImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EStructuralFeatureTreeElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EStructuralFeatureTreeElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EStructuralFeatureTreeElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/EStructuralFeatureTreeElementImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeElementImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/impl/TreeproxyPackageImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxyAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxyAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxyAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxyAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxySwitch.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxySwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxySwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_2_0/internal/treeproxy/util/TreeproxySwitch.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryPackage.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/QueryPackage.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/URIImageQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/URIImageQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/URIImageQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/URIImageQuery.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/QueryPackageImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/URIImageQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/URIImageQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/URIImageQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/impl/URIImageQueryImpl.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QueryAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QueryAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QueryAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QueryAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QuerySwitch.java b/plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QuerySwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QuerySwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.metamodel/src/org/eclipse/modisco/facet/custom/metamodel/v0_3_0/query/util/QuerySwitch.java
diff --git a/org.eclipse.modisco.facet.custom.ui/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.checkstyle
diff --git a/org.eclipse.modisco.facet.custom.ui/.classpath b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.custom.ui/.gitignore b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.custom.ui/.options b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.options
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.options
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.options
diff --git a/org.eclipse.modisco.facet.custom.ui/.pmd b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.pmd
diff --git a/org.eclipse.modisco.facet.custom.ui/.project b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.project
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.project
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.project
diff --git a/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.settings/.api_filters
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.settings/.api_filters
diff --git a/org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.custom.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.custom.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml b/plugins/facet/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/OSGI-INF/component.xml
diff --git a/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.custom.ui/about.html b/plugins/facet/org.eclipse.modisco.facet.custom.ui/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/about.html
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/about.html
diff --git a/org.eclipse.modisco.facet.custom.ui/build.properties b/plugins/facet/org.eclipse.modisco.facet.custom.ui/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/build.properties
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/aggreg.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/aggreg.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/aggreg.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/aggreg.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/aggreg_unidir.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/aggreg_unidir.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/aggreg_unidir.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/aggreg_unidir.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/attribute_facet.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/attribute_facet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/attribute_facet.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/attribute_facet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/attributes.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/attributes.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/attributes.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/attributes.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/feature.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/feature.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/feature.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/feature.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/inv_aggreg.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/inv_aggreg.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/inv_aggreg.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/inv_aggreg.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/link.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/link.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/link.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/link.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/link_unidir.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/link_unidir.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/link_unidir.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/link_unidir.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/link_unidir_facet.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/link_unidir_facet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/link_unidir_facet.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/link_unidir_facet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/icons/uiCustom.gif b/plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/uiCustom.gif
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/icons/uiCustom.gif
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/icons/uiCustom.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.custom.ui/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.custom.ui/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/plugin.xml
diff --git a/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet b/plugins/facet/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/resources/customproperties.efacet
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/CustomizedContentProviderUtils.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/CustomizedContentProviderUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/CustomizedContentProviderUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/CustomizedContentProviderUtils.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandler.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandler.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandlerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandlerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IContentPropertiesHandlerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomOverride.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomOverride.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomOverride.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomOverride.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizationManagerProvider2.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizationManagerProvider2.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizationManagerProvider2.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizationManagerProvider2.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedContentProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedContentProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedContentProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedContentProviderFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedLabelProviderFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedToolTipLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedToolTipLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedToolTipLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedToolTipLabelProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedTreeContentProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedTreeContentProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedTreeContentProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ICustomizedTreeContentProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IFontPropertiesHandler.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IFontPropertiesHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IFontPropertiesHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IFontPropertiesHandler.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/IResolvingCustomizedLabelProviderFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandler.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandler.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandlerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandlerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ISelectionPropertiesHandlerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ImageUtils.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ImageUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ImageUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/ImageUtils.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/LoadCustomShortcutsMenuUtils.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/LoadCustomShortcutsMenuUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/LoadCustomShortcutsMenuUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/LoadCustomShortcutsMenuUtils.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizationCommandFactoryFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedContentProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedContentProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedContentProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedContentProviderFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelDecorator.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelDecorator.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelDecorator.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelDecorator.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedLabelProviderFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedTreeContentProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedTreeContentProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedTreeContentProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/CustomizedTreeContentProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DecoratingCustomizedLabelProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DefaultCustomOverride.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DefaultCustomOverride.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DefaultCustomOverride.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/DefaultCustomOverride.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageManager.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageManager.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageManager.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ImageProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandler.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/PropertiesHandlerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/ResolvingCustomizedLabelProviderFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/TreeElementAdapter.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/TreeElementAdapter.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/TreeElementAdapter.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/TreeElementAdapter.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/action/ShortcutCustomAction.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/action/ShortcutCustomAction.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/action/ShortcutCustomAction.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/action/ShortcutCustomAction.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/Color.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/Color.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/Color.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/Color.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/ImageWrapper.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/ImageWrapper.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/ImageWrapper.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/ImageWrapper.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/URIImage.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/URIImage.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/URIImage.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/custompt/URIImage.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/ColorLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/ColorLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/ColorLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/ColorLabelProvider.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialog.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/LoadCustomizationsDialogFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/dialog/SynchronizedLoadCustomizationsDialog.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizationEditRuntimeException.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exception/CustomizedContentProviderRuntimeException.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/CustomizationUIConstants.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ICustomizationCommandFactoryFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandler.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/ILabelPropertiesHandlerFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialog.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/dialog/ILoadCustomizationsDialogFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/exception/IllegalParameterException.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/exception/IllegalParameterException.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/exception/IllegalParameterException.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/exported/exception/IllegalParameterException.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/handler/LoadCustomizationsHandler.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/handler/LoadCustomizationsHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/handler/LoadCustomizationsHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/handler/LoadCustomizationsHandler.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/BackgroundQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/BackgroundQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/BackgroundQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/BackgroundQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ChildrenQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ChildrenQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ChildrenQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ChildrenQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontNameQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontNameQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontNameQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontNameQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontSizeQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontSizeQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontSizeQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/FontSizeQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ForegroundQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ForegroundQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ForegroundQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ForegroundQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ImageQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ImageQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ImageQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ImageQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/LabelQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/SelectionQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/SelectionQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/SelectionQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/SelectionQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipAlignmentQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipBackgroundQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipDelayQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipDelayQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipDelayQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipDelayQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipShadowQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipShadowQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipShadowQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipShadowQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipTextQuery.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipTextQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipTextQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/ToolTipTextQuery.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/query/URIImageQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/querytype/URIImageQueryEvaluator.java
diff --git a/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/view/CustomizationsCatalogView.java b/plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/view/CustomizationsCatalogView.java
similarity index 100%
rename from org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/view/CustomizationsCatalogView.java
rename to plugins/facet/org.eclipse.modisco.facet.custom.ui/src/org/eclipse/modisco/facet/custom/ui/internal/view/CustomizationsCatalogView.java
diff --git a/org.eclipse.modisco.facet.efacet.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.efacet.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.efacet.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.efacet.core/.options b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.options
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.options
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.options
diff --git a/org.eclipse.modisco.facet.efacet.core/.pmd b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.pmd
diff --git a/org.eclipse.modisco.facet.efacet.core/.project b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.project
diff --git a/org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.efacet.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.efacet.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.efacet.core/about.html b/plugins/facet/org.eclipse.modisco.facet.efacet.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/about.html
diff --git a/org.eclipse.modisco.facet.efacet.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/build.properties
diff --git a/org.eclipse.modisco.facet.efacet.core/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.efacet.core/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/plugin.xml
diff --git a/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd b/plugins/facet/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/schema/internal.resolver.exsd
diff --git a/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd b/plugins/facet/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/schema/org.eclipse.emf.facet.efacet.core.query.evaluatorregistration.exsd
diff --git a/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd b/plugins/facet/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/schema/queryImplementationRegistration.exsd
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/FacetUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IDerivedTypedElementManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IDerivedTypedElementManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IDerivedTypedElementManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IDerivedTypedElementManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetActions.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetActions.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetActions.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetActions.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactoryFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactoryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactoryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetCommandFactoryFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerListener.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerListener.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerListener.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerListener.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerProvider.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetManagerProvider.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/IFacetSetCatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/DerivedTypedElementException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/FacetManagerException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/FacetManagerException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/FacetManagerException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/FacetManagerException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/SuperInvokeException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/SuperInvokeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/SuperInvokeException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/exception/SuperInvokeException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/CastUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/CastUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/CastUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/CastUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/DerivedTypedElementUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/EmfUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/EmfUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/EmfUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/EmfUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActions2Impl.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActionsImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActionsImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActionsImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetActionsImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetCommandFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerContext.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerInternalUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerInternalUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerInternalUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/FacetManagerInternalUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/ResolverManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/catalog/EFacetCatalogManager2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/catalog/EFacetCatalogManager2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/catalog/EFacetCatalogManager2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/catalog/EFacetCatalogManager2.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementEvaluationException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementTypeCheckingException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementTypeCheckingException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementTypeCheckingException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/DerivedTypedElementTypeCheckingException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/FacetConformanceEvaluationException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/FacetConformanceEvaluationException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/FacetConformanceEvaluationException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/FacetConformanceEvaluationException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonApplicableFacetException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonApplicableFacetException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonApplicableFacetException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonApplicableFacetException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonConformingEObjectException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonConformingEObjectException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonConformingEObjectException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/NonConformingEObjectException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/SaveStructuralFeatureInstanceModelException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/SaveStructuralFeatureInstanceModelException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/SaveStructuralFeatureInstanceModelException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/SaveStructuralFeatureInstanceModelException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/UnmatchingExpectedTypeException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/UnmatchingExpectedTypeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/UnmatchingExpectedTypeException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exception/UnmatchingExpectedTypeException.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolver.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolverManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolverManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolverManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/exported/IResolverManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/incubatingapi/IFacetActions2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/incubatingapi/IFacetActions2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/incubatingapi/IFacetActions2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/incubatingapi/IFacetActions2.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/EObjectLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FalseLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/FloatLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IntegerLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/IsOneOfQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NavigationQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/NullLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/OperationCallQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryImplementationFactoryRegistry.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/QueryUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/StringLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/query/TrueLiteralQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReference.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReference.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReference.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReference.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReferenceAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReferenceAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReferenceAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/ILinkToExtendedEObjectReferenceAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapter.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapter.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapter.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapter.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/LinkToExtendedEObjectReferenceAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/SerializationManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/SerializationManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/SerializationManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/internal/serialization/SerializationManager.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryCollectionImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryCollectionImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryCollectionImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryCollectionImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.core/src/org/eclipse/modisco/facet/efacet/core/query/IQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/.pmd b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.pmd
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/.project b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.project
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/about.html b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/about.html
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/build.properties
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/FacetCommandException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/FacetCommandException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/FacetCommandException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/FacetCommandException.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/IFacetCommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/IFacetCommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/IFacetCommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/IFacetCommandFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/FacetCommandRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/FacetCommandRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/FacetCommandRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/FacetCommandRuntimeException.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/AbstractFacetCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/AbstractFacetCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/AbstractFacetCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/AbstractFacetCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddAllCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddAllCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddAllCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddAllCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetAddCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetCommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetCommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetCommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetCommandFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveAllCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveAllCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveAllCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveAllCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetRemoveCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetSetCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetSetCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetSetCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetSetCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetUnSetCommand.java b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetUnSetCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetUnSetCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/command/FacetUnSetCommand.java
diff --git a/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.edit.core/src/org/eclipse/modisco/facet/efacet/edit/core/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/.classpath b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.gitignore b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/.project b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.project
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/.project
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.project
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.settings/.api_filters
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/about.html b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/about.html
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/about.html
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/build.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/build.properties
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-all.png b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-all.png
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-all.png
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-all.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-facet.ecorediag b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-facet.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-facet.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-facet.ecorediag
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-query.ecorediag b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-query.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-query.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-query.ecorediag
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-result.ecorediag b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-result.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-result.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-result.ecorediag
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-serialization.ecorediag b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-serialization.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-serialization.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2-serialization.ecorediag
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.ecorediag b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.ecorediag
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.ecorediag
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.ecorediag
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.png b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.png
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.png
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacet2.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/model/efacetcatalog-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/plugin.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/plugin.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/plugin.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/plugin.properties
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/plugin.xml
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Category.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Category.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Category.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Category.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DerivedTypedElement.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/DocumentedElement.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/EFacetPackage.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Facet.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Facet.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Facet.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/Facet.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetAttribute.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetElement.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetOperation.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetReference.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/FacetSet.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/ParameterValue.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensibleFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/ExtensiblePackage.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/Query.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensibleFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/ExtensiblePackageImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/impl/QueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/extensible/util/ExtensibleSwitch.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/CategoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DerivedTypedElementImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/DocumentedElementImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/EFacetPackageImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetAttributeImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetElementImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetOperationImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetReferenceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/FacetSetImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/impl/ParameterValueImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/EObjectLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FalseLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/FloatLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IntegerLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/IsOneOfQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NavigationQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/NullLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/OperationCallQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/QueryPackage.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/StringLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/TrueLiteralQuery.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/EObjectLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FalseLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/FloatLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IntegerLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/IsOneOfQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NavigationQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/NullLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/OperationCallQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/QueryPackageImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/StringLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/impl/TrueLiteralQueryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QueryAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/query/util/QuerySwitch.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectListResult.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementEObjectResult.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeListResult.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementPrimitiveTypeResult.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/ETypedElementResult.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimeFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/RuntimePackage.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectListResultImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementEObjectResultImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeListResultImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementPrimitiveTypeResultImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/ETypedElementResultImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimeFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/impl/RuntimePackageImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/runtime/util/RuntimeSwitch.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractAttributeInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/AbstractReferenceInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/ExtendedEObjectReference.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedAttributeInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedContainmentReferenceInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/MultiValuedReferenceInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SerializationPackage.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedAttributeInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedContainmentReferenceInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/SingleValuedReferenceInstance.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractAttributeInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/AbstractReferenceInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/ExtendedEObjectReferenceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedAttributeInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedContainmentReferenceInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/MultiValuedReferenceInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SerializationPackageImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedAttributeInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedContainmentReferenceInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/impl/SingleValuedReferenceInstanceImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/serialization/util/SerializationSwitch.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacet/util/EFacetSwitch.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/EfacetcatalogPackage.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/FacetSetCatalog.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/EfacetcatalogPackageImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/impl/FacetSetCatalogImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java b/plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.metamodel/src/org/eclipse/modisco/facet/efacet/metamodel/v0_2_0/efacetcatalog/util/EfacetcatalogSwitch.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.checkstyle
diff --git a/org.eclipse.modisco.facet.efacet.ui/.classpath b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.gitignore b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.efacet.ui/.pmd b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.pmd
diff --git a/org.eclipse.modisco.facet.efacet.ui/.project b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.project
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.project
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.project
diff --git a/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.settings/.api_filters
diff --git a/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.efacet.ui/about.html b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/about.html
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/about.html
diff --git a/org.eclipse.modisco.facet.efacet.ui/build.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/build.properties
diff --git a/org.eclipse.modisco.facet.efacet.ui/icons/facet.gif b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/facet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/icons/facet.gif
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/facet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/icons/flatView.gif b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/flatView.gif
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/icons/flatView.gif
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/flatView.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/icons/querySet.gif b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/querySet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/icons/querySet.gif
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/querySet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/icons/remove.gif b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/remove.gif
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/icons/remove.gif
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/remove.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/icons/removeAll.gif b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/removeAll.gif
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/icons/removeAll.gif
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/removeAll.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/icons/treeView.gif b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/treeView.gif
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/icons/treeView.gif
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/icons/treeView.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/plugin.xml
Binary files differ
diff --git a/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/schema/eTypedElementResultDisplay.exsd
diff --git a/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/schema/queryFactoryWizardPageRegistration.exsd
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetLoaderHandlerUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetLoaderHandlerUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetLoaderHandlerUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetLoaderHandlerUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetShortcutActionUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetShortcutActionUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetShortcutActionUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/FacetSetShortcutActionUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayer.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IETypedElementResultDisplayerOpener.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IFacetManagerProvider2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IFacetManagerProvider2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IFacetManagerProvider2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/IFacetManagerProvider2.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/LoadFacetSetShortcutsMenuUtils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/LoadFacetSetShortcutsMenuUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/LoadFacetSetShortcutsMenuUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/LoadFacetSetShortcutsMenuUtils.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IFacetUIFactory2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IFacetUIFactory2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IFacetUIFactory2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IFacetUIFactory2.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2Registry.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2Registry.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2Registry.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/IQueryCreationPagePart2Registry.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/ImageProvider.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/LoadMetaModelResourceAction.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/ShortcutFacetSetAction.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/ShortcutFacetSetAction.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/ShortcutFacetSetAction.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/actions/ShortcutFacetSetAction.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/BrowseComposite.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/BrowseComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/BrowseComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/BrowseComposite.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/FilteredElementSelectionComposite.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/FilteredElementSelectionComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/FilteredElementSelectionComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/FilteredElementSelectionComposite.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/SelectETypeComposite.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/SelectETypeComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/SelectETypeComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/composites/SelectETypeComposite.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/DefaultFacetLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/DefaultFacetLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/DefaultFacetLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/DefaultFacetLabelProvider.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/ETypedElementSelectionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetSelectionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetTreeContentProvider.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetTreeContentProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetTreeContentProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/FacetSetTreeContentProvider.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedETypedElementSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedETypedElementSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedETypedElementSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedETypedElementSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedFacetSetSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedFacetSetSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedFacetSetSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/SynchronizedFacetSetSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/dialogs/UriDialogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/EFacetUIConstants.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogCallback.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogCallback.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogCallback.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogCallback.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogInternal.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogInternal.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogInternal.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IETypedElementSelectionDialogInternal.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogInternal.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogInternal.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogInternal.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IFacetSetSelectionDialogInternal.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IUriDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IUriDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IUriDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/dialog/IUriDialogFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationView.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationViewFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationViewFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationViewFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/view/INavigationViewFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidget.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidget.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IETypedElementSelectionWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidget.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidget.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IFacetSetSelectionWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidget.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidget.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/widget/IUriWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetInFacetSetWizard2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetInFacetSetWizard2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetInFacetSetWizard2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetInFacetSetWizard2.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetSetWizard.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetSetWizard.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetSetWizard.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ICreateFacetSetWizard.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/IFacetChildrenWizard2.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/IFacetChildrenWizard2.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/IFacetChildrenWizard2.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/IFacetChildrenWizard2.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ISelectETypeWizard.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ISelectETypeWizard.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ISelectETypeWizard.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/exported/wizard/ISelectETypeWizard.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/LoadFacetHandler.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/LoadFacetHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/LoadFacetHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/LoadFacetHandler.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/NavigationHandler.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/NavigationHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/NavigationHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/NavigationHandler.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SaveStructuralFeatureInstanceModelHandler.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SaveStructuralFeatureInstanceModelHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SaveStructuralFeatureInstanceModelHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SaveStructuralFeatureInstanceModelHandler.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SetStructuralFeatureInstanceResourceHandler.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SetStructuralFeatureInstanceResourceHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SetStructuralFeatureInstanceResourceHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/SetStructuralFeatureInstanceResourceHandler.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/Utils.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/Utils.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/Utils.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/handlers/Utils.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferenceConstants.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferenceConstants.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferenceConstants.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferenceConstants.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferencesInitializer.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferencesInitializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferencesInitializer.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/preferences/PreferencesInitializer.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationView.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationView.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationView.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationView.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationViewFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationViewFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationViewFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/sync/generated/SynchronizedNavigationViewFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/utils/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/utils/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/utils/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/utils/ImageProvider.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/ContextPaneMenuManager.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/DropAdapter.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/EditableContext.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/FacetSetsCatalogView.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/FacetSetsCatalogView.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/FacetSetsCatalogView.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/FacetSetsCatalogView.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationView.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewResourceSetException.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewResourceSetException.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewResourceSetException.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/NavigationViewResourceSetException.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/view/QueryResultDisplayersRegistry.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/EClassifierSelectionControl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/EClassifierSelectionControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/EClassifierSelectionControl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/EClassifierSelectionControl.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControl.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlContentProvider.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlContentProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlContentProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlContentProvider.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionControlManager.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionSortedControl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionSortedControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionSortedControl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionSortedControl.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/ETypedElementSelectionWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionControl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionControl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionControl.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/FacetSetSelectionWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionControlManager.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionControlManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionControlManager.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionControlManager.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionWidgetInternal.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionWidgetInternal.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionWidgetInternal.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementSelectionWidgetInternal.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementTabSelectionWidgetInternal.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementTabSelectionWidgetInternal.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementTabSelectionWidgetInternal.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/IETypedElementTabSelectionWidgetInternal.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/MetamodelSelectionControl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/MetamodelSelectionControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/MetamodelSelectionControl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/MetamodelSelectionControl.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedETypedElementSelectionWidget.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedETypedElementSelectionWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedETypedElementSelectionWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedETypedElementSelectionWidget.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedFacetSetSelectionWidget.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedFacetSetSelectionWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedFacetSetSelectionWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/SynchronizedFacetSetSelectionWidget.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidget.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidget.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidgetFactory.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidgetFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidgetFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/widget/UriWidgetFactory.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/SelectETypeWizardImpl.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/SelectETypeWizardImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/SelectETypeWizardImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/SelectETypeWizardImpl.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/FacetSetPropertyWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/FacetSetPropertyWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/FacetSetPropertyWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/FacetSetPropertyWizardPage.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEClassifierWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEClassifierWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEClassifierWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEClassifierWizardPage.java
diff --git a/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEPackageWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEPackageWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEPackageWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.efacet.ui/src/org/eclipse/modisco/facet/efacet/ui/internal/wizards/pages/SelectEPackageWizardPage.java
diff --git a/org.eclipse.modisco.facet.query.java.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.query.java.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.query.java.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.query.java.core/.project b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/.project
diff --git a/org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.query.java.core/API.README.txt b/plugins/facet/org.eclipse.modisco.facet.query.java.core/API.README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/API.README.txt
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/API.README.txt
diff --git a/org.eclipse.modisco.facet.query.java.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.query.java.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.query.java.core/about.html b/plugins/facet/org.eclipse.modisco.facet.query.java.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/about.html
diff --git a/org.eclipse.modisco.facet.query.java.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.query.java.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/build.properties
diff --git a/org.eclipse.modisco.facet.query.java.core/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.query.java.core/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/plugin.xml
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery2.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IJavaQuery3.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueList2.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueListFactory2.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueListFactory2.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueListFactory2.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/IParameterValueListFactory2.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueList2.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueListFactoryImpl2.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueListFactoryImpl2.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueListFactoryImpl2.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/ParameterValueListFactoryImpl2.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementation.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementationFactory.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/evaluator/JavaQueryImplementationFactory.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ClassAlreadyExistsException.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ClassAlreadyExistsException.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ClassAlreadyExistsException.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ClassAlreadyExistsException.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ResourceURIExpectedException.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ResourceURIExpectedException.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ResourceURIExpectedException.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/exceptions/ResourceURIExpectedException.java
diff --git a/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java b/plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.core/src/org/eclipse/modisco/facet/query/java/core/internal/plugin/Activator.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/.classpath b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.gitignore b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/.project b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.project
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/.project
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.project
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/about.html b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/about.html
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/about.html
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/build.properties b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/build.properties
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.ecore
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/model/javaQuery-0.2.0.genmodel
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/plugin.properties b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/plugin.properties
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/plugin.properties
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/plugin.properties
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/plugin.xml
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQuery.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryFactory.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/JavaQueryPackage.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryImpl.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/impl/JavaQueryPackageImpl.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQueryAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java b/plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.query.java.metamodel/src/org/eclipse/modisco/facet/query/java/metamodel/v0_2_0/javaquery/util/JavaQuerySwitch.java
diff --git a/plugins/facet/org.eclipse.modisco.facet.query.java/.gitignore b/plugins/facet/org.eclipse.modisco.facet.query.java/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.query.java/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.query.java/.project b/plugins/facet/org.eclipse.modisco.facet.query.java/.project
similarity index 100%
rename from org.eclipse.modisco.facet.query.java/.project
rename to plugins/facet/org.eclipse.modisco.facet.query.java/.project
diff --git a/org.eclipse.modisco.facet.util.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.core/.project b/plugins/facet/org.eclipse.modisco.facet.util.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.core/.project
diff --git a/org.eclipse.modisco.facet.util.core/.settings/.api_filters b/plugins/facet/org.eclipse.modisco.facet.util.core/.settings/.api_filters
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/.settings/.api_filters
rename to plugins/facet/org.eclipse.modisco.facet.util.core/.settings/.api_filters
diff --git a/org.eclipse.modisco.facet.util.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.core/API.README.txt b/plugins/facet/org.eclipse.modisco.facet.util.core/API.README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/API.README.txt
rename to plugins/facet/org.eclipse.modisco.facet.util.core/API.README.txt
diff --git a/org.eclipse.modisco.facet.util.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.core/README.txt b/plugins/facet/org.eclipse.modisco.facet.util.core/README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/README.txt
rename to plugins/facet/org.eclipse.modisco.facet.util.core/README.txt
diff --git a/org.eclipse.modisco.facet.util.core/about.html b/plugins/facet/org.eclipse.modisco.facet.util.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.core/about.html
diff --git a/org.eclipse.modisco.facet.util.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.core/build.properties
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/DebugUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/Logger.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/exception/DebuggingRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/exception/DebuggingRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/exception/DebuggingRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/exception/DebuggingRuntimeException.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/ErrorHandlingUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/ErrorHandlingUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/ErrorHandlingUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/ErrorHandlingUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/JavaUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/JavaUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/JavaUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/JavaUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/AbstractRegistry.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FileUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/FolderUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/IFilter.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/ListUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/ListUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/ListUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/ListUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/exported/StringUtils.java
diff --git a/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.core/src/org/eclipse/modisco/facet/util/core/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.project b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.project
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/about.html b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/about.html
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/build.properties
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.ecore b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.ecore
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.ecore
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/model/catalog-1.1.genmodel
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/plugin.xml
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogPackage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/CatalogPackage.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/InstallAndWokspaceCatalog.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/InstallAndWokspaceCatalog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/InstallAndWokspaceCatalog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/InstallAndWokspaceCatalog.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/CatalogPackageImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/InstallAndWokspaceCatalogImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/InstallAndWokspaceCatalogImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/InstallAndWokspaceCatalogImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/impl/InstallAndWokspaceCatalogImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogSwitch.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog.metamodel/src/org/eclipse/modisco/facet/util/emf/catalog/metamodel/internal/v1_1/catalog/util/CatalogSwitch.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/.project b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.project
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/about.html b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/about.html
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/build.properties
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.ecore
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/model/catalog.genmodel
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/plugin.xml
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/Catalog.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/Catalog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/Catalog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/Catalog.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogPackage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogPackage.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogSet.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogSet.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogSet.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/CatalogSet.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogPackageImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogSetImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogSetImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogSetImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/impl/CatalogSetImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/plugin/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/plugin/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/plugin/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/plugin/Activator.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogSwitch.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.catalog/src/org/eclipse/modisco/facet/util/emf/catalog/util/CatalogSwitch.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.emf.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.emf.core/.pmd b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/.pmd
diff --git a/org.eclipse.modisco.facet.util.emf.core/.project b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/.project
diff --git a/org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.emf.core/API.README.txt b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/API.README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/API.README.txt
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/API.README.txt
diff --git a/org.eclipse.modisco.facet.util.emf.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.emf.core/about.html b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/about.html
diff --git a/org.eclipse.modisco.facet.util.emf.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/build.properties
diff --git a/org.eclipse.modisco.facet.util.emf.core/model/serialization.ecore b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/model/serialization.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/model/serialization.ecore
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/model/serialization.ecore
diff --git a/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/model/serialization.genmodel
diff --git a/org.eclipse.modisco.facet.util.emf.core/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/plugin.xml
diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/catalogmanager.exsd
diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/modelViewer.exsd
diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/org.eclipse.emf.facet.util.emf.core.modeldeclaration.exsd
diff --git a/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/schema/serialization.exsd
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/CommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/CommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/CommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/CommandFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/EmfDebugUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IBrowserRegistry.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IBrowserRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IBrowserRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IBrowserRegistry.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogManager.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManager2.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ICatalogSetManagerFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEObjectBrowserOpener.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IEPackageBrowserOpener.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/IResourceBrowserOpener.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/ModelUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManager.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerConfiguration.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerConfiguration.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerConfiguration.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerConfiguration.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/catalog/ICatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/EmfCommandUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/EmfCommandUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/EmfCommandUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/EmfCommandUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResult.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResult.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResult.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResultFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResultFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResultFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ICommandFactoryResultFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ILockableUndoCommand.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ILockableUndoCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ILockableUndoCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/command/ILockableUndoCommand.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/DebugRuntimeException.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/InvalidFacetSetException.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/InvalidFacetSetException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/InvalidFacetSetException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/exception/InvalidFacetSetException.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/EMFUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/EMFUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/EMFUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/EMFUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManager.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/CatalogSetManagerFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListener.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListener.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListener.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListener.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListenerFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListenerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListenerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogListenerFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManager.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManagerFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManagerFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManagerFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/CatalogManagerFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfCommandUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfCommandUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfCommandUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfCommandUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/catalog/v2/EmfUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/AddResourceContentCommand.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/AddResourceContentCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/AddResourceContentCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/AddResourceContentCommand.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResult.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResult.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResult.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResult.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResultFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResultFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResultFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/CommandFactoryResultFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/SetResourceContentCommand.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/SetResourceContentCommand.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/SetResourceContentCommand.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/command/SetResourceContentCommand.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/exported/ICommandFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceConstants.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceConstants.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceConstants.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceConstants.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceInitializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceInitializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceInitializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/preferences/PreferenceInitializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/registry/BrowserRegistry.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationRegistry.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationService.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationService.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationService.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/SerializationService.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/BooleanSerializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/BooleanSerializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/BooleanSerializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/BooleanSerializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/EMFURISerializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/EMFURISerializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/EMFURISerializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/EMFURISerializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IResourceSerializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IResourceSerializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IResourceSerializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IResourceSerializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IntegerSerializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IntegerSerializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IntegerSerializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/IntegerSerializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/StringSerializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/StringSerializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/StringSerializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/internal/serialization/serializers/StringSerializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationRegistry.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationRegistry.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationService.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationService.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationService.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializationService.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializer.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializer.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializer.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/ISerializer.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/SerializationPackage.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.core/src/org/eclipse/modisco/facet/util/emf/core/serialization/model/serialization/impl/SerializationPackageImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.pmd b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.pmd
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.project b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.project
diff --git a/org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.emf.ui/about.html b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/about.html
diff --git a/org.eclipse.modisco.facet.util.emf.ui/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/build.properties
diff --git a/org.eclipse.modisco.facet.util.emf.ui/icons/EPackageView.gif b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/EPackageView.gif
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/icons/EPackageView.gif
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/EPackageView.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.util.emf.ui/icons/ModelIcon.gif b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/ModelIcon.gif
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/icons/ModelIcon.gif
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/ModelIcon.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.util.emf.ui/icons/catalog.png b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/catalog.png
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/icons/catalog.png
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/catalog.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.util.emf.ui/icons/logoEmfFacetMini.gif b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/logoEmfFacetMini.gif
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/icons/logoEmfFacetMini.gif
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/icons/logoEmfFacetMini.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.util.emf.ui/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/plugin.xml
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProvider.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/EmfLabelProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/ResourceUiUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/ResourceUiUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/ResourceUiUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/ResourceUiUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/actions/OpenModelFromEmfRegistryAction.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/actions/OpenModelFromEmfRegistryAction.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/actions/OpenModelFromEmfRegistryAction.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/actions/OpenModelFromEmfRegistryAction.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/CreateInstanceDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/CreateInstanceDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/CreateInstanceDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/CreateInstanceDialog.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/SaveAsDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/SaveAsDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/SaveAsDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/SaveAsDialog.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/URIComposite.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/URIComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/URIComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/URIComposite.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/UriSelectionDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/UriSelectionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/UriSelectionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/dialogs/UriSelectionDialog.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/IEmfLabelProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/IEmfLabelProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/IEmfLabelProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/IEmfLabelProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/composite/EClassifierSelectionControl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/composite/EClassifierSelectionControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/composite/EClassifierSelectionControl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/composite/EClassifierSelectionControl.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/AbstractGetMetaclassWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/AbstractGetMetaclassWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/AbstractGetMetaclassWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/AbstractGetMetaclassWidget.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/MetamodelSelectionControl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/MetamodelSelectionControl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/MetamodelSelectionControl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/widget/component/metaclass/MetamodelSelectionControl.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SelectETypeWizardImpl.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SelectETypeWizardImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SelectETypeWizardImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SelectETypeWizardImpl.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SynchronizedSelectETypeWizard.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SynchronizedSelectETypeWizard.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SynchronizedSelectETypeWizard.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/SynchronizedSelectETypeWizard.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEClassifierWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEClassifierWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEClassifierWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEClassifierWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEPackageWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEPackageWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEPackageWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SelectEPackageWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEClassifierWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEClassifierWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEClassifierWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEClassifierWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEPackageWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEPackageWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEPackageWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedSelectEPackageWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/SynchronizedWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEClassifierRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEClassifierRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEClassifierRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEClassifierRuntimeException.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEPackageRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEPackageRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEPackageRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/util/wizard/page/exception/SelectedEPackageRuntimeException.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/ISelectETypeWizard.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/ISelectETypeWizard.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/ISelectETypeWizard.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/ISelectETypeWizard.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEClassifierWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEClassifierWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEClassifierWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEClassifierWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEPackageWizardPage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEPackageWizardPage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEPackageWizardPage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/exported/wizard/page/ISelectEPackageWizardPage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveAsHandler.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveAsHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveAsHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveAsHandler.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveHandler.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/handler/SaveHandler.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/preference/pages/DefaultBrowserPreferencePage.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/preference/pages/DefaultBrowserPreferencePage.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/preference/pages/DefaultBrowserPreferencePage.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/preference/pages/DefaultBrowserPreferencePage.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageProvider.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/utils/ImageUtils.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/internal/view/PackageRegistryView.java
diff --git a/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/util/EditingUtil.java b/plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/util/EditingUtil.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/util/EditingUtil.java
rename to plugins/facet/org.eclipse.modisco.facet.util.emf.ui/src/org/eclipse/modisco/facet/util/emf/ui/util/EditingUtil.java
diff --git a/org.eclipse.modisco.facet.util.jface.ui/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.jface.ui/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.jface.ui/.options b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.options
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/.options
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.options
diff --git a/org.eclipse.modisco.facet.util.jface.ui/.pmd b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.pmd
diff --git a/org.eclipse.modisco.facet.util.jface.ui/.project b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.project
diff --git a/org.eclipse.modisco.facet.util.jface.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.jface.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.jface.ui/about.html b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/about.html
diff --git a/org.eclipse.modisco.facet.util.jface.ui/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/build.properties
diff --git a/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProvider.java
diff --git a/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/imageprovider/IImageProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProvider.java
diff --git a/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.jface.ui/src/org/eclipse/modisco/facet/util/jface/ui/internal/imageprovider/ImageProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.pde.core/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.pde.core/.pmd b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/.pmd
diff --git a/org.eclipse.modisco.facet.util.pde.core/.project b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/.project
diff --git a/org.eclipse.modisco.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.pde.core/about.html b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/about.html
diff --git a/org.eclipse.modisco.facet.util.pde.core/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/build.properties
diff --git a/org.eclipse.modisco.facet.util.pde.core/resources/Activator.java.template b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/resources/Activator.java.template
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/resources/Activator.java.template
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/resources/Activator.java.template
diff --git a/org.eclipse.modisco.facet.util.pde.core/resources/MANIFEST.MF.template b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/resources/MANIFEST.MF.template
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/resources/MANIFEST.MF.template
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/resources/MANIFEST.MF.template
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/BuildPropertiesUtils.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/PluginUtils.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exception/PdeCoreUtilsRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exception/PdeCoreUtilsRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exception/PdeCoreUtilsRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exception/PdeCoreUtilsRuntimeException.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/BuildPropertiesUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/BuildPropertiesUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/BuildPropertiesUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/BuildPropertiesUtils.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/PluginUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/PluginUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/PluginUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/PluginUtils.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/TargetPlatformUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/TargetPlatformUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/TargetPlatformUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/TargetPlatformUtils.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/PdeCoreUtilsException.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/PdeCoreUtilsException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/PdeCoreUtilsException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/PdeCoreUtilsException.java
diff --git a/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/ReflexiveDiscouragedAccessException.java b/plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/ReflexiveDiscouragedAccessException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/ReflexiveDiscouragedAccessException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.pde.core/src/org/eclipse/modisco/facet/util/pde/core/internal/exported/exception/ReflexiveDiscouragedAccessException.java
diff --git a/org.eclipse.modisco.facet.util.swt/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.swt/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.swt/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.swt/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.swt/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.swt/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.swt/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.swt/.options b/plugins/facet/org.eclipse.modisco.facet.util.swt/.options
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.options
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.options
diff --git a/org.eclipse.modisco.facet.util.swt/.project b/plugins/facet/org.eclipse.modisco.facet.util.swt/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.project
diff --git a/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.runtime.prefs b/plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.runtime.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.runtime.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.core.runtime.prefs
diff --git a/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.ui.prefs b/plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.ui.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.ui.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/.settings/org.eclipse.jdt.ui.prefs
diff --git a/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.swt/about.html b/plugins/facet/org.eclipse.modisco.facet.util.swt/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/about.html
diff --git a/org.eclipse.modisco.facet.util.swt/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.swt/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/build.properties
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProvider.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/colorprovider/IColorProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProvider.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/fontprovider/IFontProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProvider.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/imageprovider/IImageProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProvider.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/colorprovider/ColorProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/SWTTestUtils.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/exported/TestUtils.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProvider.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/fontprovider/FontProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProvider.java
diff --git a/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProviderFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProviderFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProviderFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.swt/src/org/eclipse/modisco/facet/util/swt/internal/imageprovider/ImageProviderFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.util.ui/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.checkstyle
diff --git a/org.eclipse.modisco.facet.util.ui/.classpath b/plugins/facet/org.eclipse.modisco.facet.util.ui/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.classpath
diff --git a/org.eclipse.modisco.facet.util.ui/.fbprefs b/plugins/facet/org.eclipse.modisco.facet.util.ui/.fbprefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.fbprefs
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.fbprefs
diff --git a/plugins/facet/org.eclipse.modisco.facet.util.ui/.gitignore b/plugins/facet/org.eclipse.modisco.facet.util.ui/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.util.ui/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.util.ui/.options b/plugins/facet/org.eclipse.modisco.facet.util.ui/.options
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.options
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.options
diff --git a/org.eclipse.modisco.facet.util.ui/.pmd b/plugins/facet/org.eclipse.modisco.facet.util.ui/.pmd
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.pmd
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.pmd
diff --git a/org.eclipse.modisco.facet.util.ui/.project b/plugins/facet/org.eclipse.modisco.facet.util.ui/.project
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.project
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.project
diff --git a/org.eclipse.modisco.facet.util.ui/.settings/.api_filters b/plugins/facet/org.eclipse.modisco.facet.util.ui/.settings/.api_filters
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.settings/.api_filters
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.settings/.api_filters
diff --git a/org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.core.resources.prefs b/plugins/facet/org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.core.resources.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.core.resources.prefs
diff --git a/org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.util.ui/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.util.ui/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.util.ui/about.html b/plugins/facet/org.eclipse.modisco.facet.util.ui/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/about.html
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/about.html
diff --git a/org.eclipse.modisco.facet.util.ui/build.properties b/plugins/facet/org.eclipse.modisco.facet.util.ui/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/build.properties
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/OkDialogFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/dialog/QuestionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement2.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement2.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement2.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/PropertyElement2.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/WidgetProperties.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/WidgetProperties.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/WidgetProperties.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/WidgetProperties.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/composite/IFilteredElementSelectionComposite.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/composite/IFilteredElementSelectionComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/composite/IFilteredElementSelectionComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/composite/IFilteredElementSelectionComposite.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallback.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallback.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallback.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallback.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallbackWithPreCommit.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallbackWithPreCommit.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallbackWithPreCommit.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogCallbackWithPreCommit.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogWithoutResultCallback.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogWithoutResultCallback.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogWithoutResultCallback.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IDialogWithoutResultCallback.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IOkDialogFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IQuestionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IWithResultDialogCallback.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IWithResultDialogCallback.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IWithResultDialogCallback.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/dialog/IWithResultDialogCallback.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractExceptionFreeRunnable.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidExceptionFreeRunnable.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/AbstractVoidRunnable.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/DisplaySyncRuntimeException.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/IRunnable.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedComposite.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/displaysync/SynchronizedObject.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/handler/HandlerUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/handler/HandlerUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/handler/HandlerUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/handler/HandlerUtils.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/tree/menu/ITreeMenu.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/tree/menu/ITreeMenu.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/tree/menu/ITreeMenu.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/tree/menu/ITreeMenu.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/FilteredElementSelectionComposite.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/SynchronizedFilteredElementSelectionComposite.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/SynchronizedFilteredElementSelectionComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/SynchronizedFilteredElementSelectionComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/composite/SynchronizedFilteredElementSelectionComposite.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialogWithCallback.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialogWithCallback.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialogWithCallback.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractDialogWithCallback.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractMainDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractMainDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractMainDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/AbstractMainDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/SynchronizedAbstractDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/SynchronizedAbstractDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/SynchronizedAbstractDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/dialog/SynchronizedAbstractDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/handler/AbstractSelectionExpectedTypeHandler.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/handler/AbstractSelectionExpectedTypeHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/handler/AbstractSelectionExpectedTypeHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/handler/AbstractSelectionExpectedTypeHandler.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/ExtendedTree.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/ExtendedTree.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/ExtendedTree.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/ExtendedTree.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/item/AbstractTreeItem.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/item/AbstractTreeItem.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/item/AbstractTreeItem.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/item/AbstractTreeItem.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenu.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenu.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenu.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenu.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenuItem.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenuItem.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenuItem.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeMenuItem.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeSubMenu.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeSubMenu.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeSubMenu.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/AbstractTreeSubMenu.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/ExtendedTreeMenu.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/ExtendedTreeMenu.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/ExtendedTreeMenu.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/tree/menu/ExtendedTreeMenu.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/AbstractWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/AbstractWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/AbstractWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/AbstractWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractCommandWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/AbstractGetOrCreateFilteredElementCommandWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/ICommandWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/ICommandWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/ICommandWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/ICommandWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/IGetOrCreateFilteredElementCommmandWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/IGetOrCreateFilteredElementCommmandWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/IGetOrCreateFilteredElementCommmandWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/command/IGetOrCreateFilteredElementCommmandWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/CreateElementWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/CreateElementWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/CreateElementWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/CreateElementWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithButtonWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithButtonWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithButtonWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithButtonWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithDialogButtonWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithDialogButtonWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithDialogButtonWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithDialogButtonWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/getorcreate/AbstractGetOrCreateElementWithWizardButtonWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/AbstractGetPropertyWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/AbstractGetPropertyWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/AbstractGetPropertyWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/AbstractGetPropertyWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/bounds/AbstractGetBoundsWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/bounds/AbstractGetBoundsWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/bounds/AbstractGetBoundsWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/bounds/AbstractGetBoundsWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractGetElementNameWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractGetElementNameWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractGetElementNameWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractGetElementNameWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractPrintElementWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractPrintElementWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractPrintElementWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/component/properties/name/AbstractPrintElementWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/query/AbstractQueryWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/query/AbstractQueryWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/query/AbstractQueryWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/widget/query/AbstractQueryWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/wizard/SynchronizedWizard.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/wizard/SynchronizedWizard.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/wizard/SynchronizedWizard.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/util/wizard/SynchronizedWizard.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/IAbstractWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/IAbstractWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/IAbstractWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/IAbstractWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWithButtonWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWithButtonWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWithButtonWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/widget/getorcreate/IAbstractGetOrCreateElementWithButtonWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/wizard/IExtendedWizard.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/wizard/IExtendedWizard.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/wizard/IExtendedWizard.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/exported/wizard/IExtendedWizard.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWithButtonWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWithButtonWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWithButtonWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedAbstractGetOrCreateElementWithButtonWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedGetOrCreateFilteredElementCommmandWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedGetOrCreateFilteredElementCommmandWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedGetOrCreateFilteredElementCommmandWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedGetOrCreateFilteredElementCommmandWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedOkDialogFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialog.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialog.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialogFactory.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialogFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialogFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/sync/generated/SynchronizedQuestionDialogFactory.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/widget/metaclass/FilteredElementSelectionWidget.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/widget/metaclass/FilteredElementSelectionWidget.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/widget/metaclass/FilteredElementSelectionWidget.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/internal/widget/metaclass/FilteredElementSelectionWidget.java
diff --git a/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/utils/UIUtils.java b/plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/utils/UIUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/utils/UIUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.util.ui/src/org/eclipse/modisco/facet/util/ui/utils/UIUtils.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.checkstyle
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/.classpath b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.gitignore b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/.project b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.project
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/.project
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.project
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/about.html b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/about.html
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/about.html
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/build.properties b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/build.properties
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/org.eclipse.modisco.facet.widgets.celleditors.ecore.modelcelleditors
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/plugin.xml
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Activator.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigDecimalCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigDecimalCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigDecimalCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigDecimalCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigIntegerCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigIntegerCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigIntegerCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBigIntegerCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBooleanCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBooleanCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBooleanCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EBooleanCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EByteCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EByteCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EByteCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EByteCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ECharCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ECharCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ECharCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ECharCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EDoubleCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EDoubleCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EDoubleCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EDoubleCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EFloatCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EFloatCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EFloatCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EFloatCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EIntCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EIntCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EIntCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EIntCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ELongCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ELongCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ELongCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ELongCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EShortCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EShortCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EShortCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EShortCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EStringMultiCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EStringMultiCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EStringMultiCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/EStringMultiCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/Messages.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigDecimalCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BigIntegerCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/BooleanCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ByteCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/CharCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/DoubleCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/FloatCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/IntCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/LongCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/ShortCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/composite/StringMultiCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/messages.properties b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/messages.properties
diff --git a/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ui/MultiLineDialog.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ui/MultiLineDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ui/MultiLineDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors.ecore/src/org/eclipse/modisco/facet/widgets/celleditors/ecore/ui/MultiLineDialog.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.checkstyle
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/.classpath b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.gitignore b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/.project b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.project
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/.project
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.project
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/API.README.txt b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/API.README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/API.README.txt
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/API.README.txt
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/about.html b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/about.html
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/about.html
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/build.properties b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/build.properties
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.ecore b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.ecore
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.ecore
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.ecore
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/model/celleditors.genmodel
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/org.eclipse.modisco.facet.widgets.celleditors.core.modelcelleditors
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/plugin.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/plugin.properties
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/plugin.xml b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/plugin.xml
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/plugin.xml
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/plugin.xml
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/schema/celleditors.exsd
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/schema/commandFactories.exsd
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/schema/compositeEditorFactories.exsd
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/AbstractCellEditorComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/AbstractCellEditorComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/AbstractCellEditorComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/AbstractCellEditorComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/CellEditorsUtils.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/CellEditorsUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/CellEditorsUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/CellEditorsUtils.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICellEditorsRegistry.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactoriesRegistry.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICommandFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICompositeEditorFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICompositeEditorFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICompositeEditorFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/ICompositeEditorFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IListener.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IListener.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IListener.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IListener.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditHandler.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditHandler.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditHandler.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditHandler.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorContainer.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorValidator.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorValidator.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorValidator.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IModelCellEditorValidator.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEAttributeCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEAttributeCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEAttributeCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEAttributeCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEReferenceCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEReferenceCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEReferenceCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryEReferenceCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryFeatureCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryFeatureCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryFeatureCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/INaryFeatureCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IValidator.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IValidator.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IValidator.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IValidator.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IWidget2.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IWidget2.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IWidget2.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/IWidget2.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/core/composite/registry/ICompositeEditorFactoriesRegistry.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CellEditorsRegistry.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/CommandFactoriesRegistry.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/DefaultCommandFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/Messages.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ModelCellEditorContainer.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/composite/registries/CompositeEditorFactoriesRegistry.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/EEnumCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryAttributeCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/NaryReferenceCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/UnaryReferenceCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/AbstractIResourceComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIFileComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIProjectComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIProjectComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIProjectComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIProjectComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/CoreIResourceComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/EnumeratorComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/UnaryReferenceCellEditorComposite.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIFileCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIFileCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIFileCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIFileCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIProjectCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIProjectCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIProjectCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIProjectCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIResourceCompositeFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIResourceCompositeFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIResourceCompositeFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/core/composite/factories/CoreIResourceCompositeFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/messages.properties b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/messages.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/messages.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/messages.properties
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AbstractNaryEditingDialog.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AbstractNaryEditingDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AbstractNaryEditingDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AbstractNaryEditingDialog.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AssignableValuesContentProvider.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AssignableValuesContentProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AssignableValuesContentProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/AssignableValuesContentProvider.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/EditingUtils.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/EditingUtils.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/EditingUtils.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/EditingUtils.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/FeatureValuesInput.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/FeatureValuesInput.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/FeatureValuesInput.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/FeatureValuesInput.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/ModelCellsEditingSupport.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryAttributeEditingDialog.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/internal/ui/NaryReferenceEditingDialog.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/AbstractModelCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/AbstractModelCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/AbstractModelCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/AbstractModelCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/BasicCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/BasicCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/BasicCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/BasicCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorDeclarations.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorDeclarations.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorDeclarations.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorDeclarations.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorPackage.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorPackage.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorPackage.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/ModelCellEditorPackage.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/NaryFeatureCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/NaryFeatureCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/NaryFeatureCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/NaryFeatureCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/UnaryReferenceCellEditor.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/UnaryReferenceCellEditor.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/UnaryReferenceCellEditor.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/UnaryReferenceCellEditor.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/AbstractModelCellEditorImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/AbstractModelCellEditorImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/AbstractModelCellEditorImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/AbstractModelCellEditorImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/BasicCellEditorImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/BasicCellEditorImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/BasicCellEditorImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/BasicCellEditorImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorDeclarationsImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorDeclarationsImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorDeclarationsImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorDeclarationsImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorFactoryImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorFactoryImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorFactoryImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorFactoryImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorPackageImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorPackageImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorPackageImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/ModelCellEditorPackageImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/NaryFeatureCellEditorImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/NaryFeatureCellEditorImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/NaryFeatureCellEditorImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/NaryFeatureCellEditorImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/UnaryReferenceCellEditorImpl.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/UnaryReferenceCellEditorImpl.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/UnaryReferenceCellEditorImpl.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/impl/UnaryReferenceCellEditorImpl.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorAdapterFactory.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorAdapterFactory.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorAdapterFactory.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorAdapterFactory.java
diff --git a/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorSwitch.java b/plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorSwitch.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorSwitch.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets.celleditors/src/org/eclipse/modisco/facet/widgets/celleditors/modelCellEditor/util/ModelCellEditorSwitch.java
diff --git a/org.eclipse.modisco.facet.widgets/.checkstyle b/plugins/facet/org.eclipse.modisco.facet.widgets/.checkstyle
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/.checkstyle
rename to plugins/facet/org.eclipse.modisco.facet.widgets/.checkstyle
diff --git a/org.eclipse.modisco.facet.widgets/.classpath b/plugins/facet/org.eclipse.modisco.facet.widgets/.classpath
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/.classpath
rename to plugins/facet/org.eclipse.modisco.facet.widgets/.classpath
diff --git a/plugins/facet/org.eclipse.modisco.facet.widgets/.gitignore b/plugins/facet/org.eclipse.modisco.facet.widgets/.gitignore
new file mode 100644
index 0000000..934e0e0
--- /dev/null
+++ b/plugins/facet/org.eclipse.modisco.facet.widgets/.gitignore
@@ -0,0 +1,2 @@
+/bin
+/target
diff --git a/org.eclipse.modisco.facet.widgets/.project b/plugins/facet/org.eclipse.modisco.facet.widgets/.project
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/.project
rename to plugins/facet/org.eclipse.modisco.facet.widgets/.project
diff --git a/org.eclipse.modisco.facet.widgets/.settings/org.eclipse.jdt.core.prefs b/plugins/facet/org.eclipse.modisco.facet.widgets/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/.settings/org.eclipse.jdt.core.prefs
rename to plugins/facet/org.eclipse.modisco.facet.widgets/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.modisco.facet.widgets/API.README.txt b/plugins/facet/org.eclipse.modisco.facet.widgets/API.README.txt
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/API.README.txt
rename to plugins/facet/org.eclipse.modisco.facet.widgets/API.README.txt
diff --git a/org.eclipse.modisco.facet.widgets/META-INF/MANIFEST.MF b/plugins/facet/org.eclipse.modisco.facet.widgets/META-INF/MANIFEST.MF
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/META-INF/MANIFEST.MF
rename to plugins/facet/org.eclipse.modisco.facet.widgets/META-INF/MANIFEST.MF
diff --git a/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties b/plugins/facet/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets/OSGI-INF/l10n/bundle.properties
diff --git a/org.eclipse.modisco.facet.widgets/about.html b/plugins/facet/org.eclipse.modisco.facet.widgets/about.html
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/about.html
rename to plugins/facet/org.eclipse.modisco.facet.widgets/about.html
diff --git a/org.eclipse.modisco.facet.widgets/build.properties b/plugins/facet/org.eclipse.modisco.facet.widgets/build.properties
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/build.properties
rename to plugins/facet/org.eclipse.modisco.facet.widgets/build.properties
diff --git a/org.eclipse.modisco.facet.widgets/icons/Facet.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/Facet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/Facet.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/Facet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/error.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/error.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/error.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/error.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/add.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/add.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/add.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/add.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/addUiCustom.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/addUiCustom.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/addUiCustom.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/addUiCustom.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg_unidir.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg_unidir.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg_unidir.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/aggreg_unidir.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/attribute_facet.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/attribute_facet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/attribute_facet.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/attribute_facet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/attributes.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/attributes.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/attributes.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/attributes.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/collapseall.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/collapseall.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/collapseall.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/collapseall.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/common_columns.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/common_columns.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/common_columns.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/common_columns.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/container.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/container.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/container.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/container.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/decrease_font_size.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/decrease_font_size.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/decrease_font_size.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/decrease_font_size.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/delete.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/delete.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/delete.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/delete.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derivation_tree.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derivation_tree.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/derivation_tree.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derivation_tree.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived_instances.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived_instances.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived_instances.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/derived_instances.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/eClass.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/eClass.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/eClass.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/eClass.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/element_id.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/element_id.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/element_id.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/element_id.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_attributes.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_attributes.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_attributes.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_attributes.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_links.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_links.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_links.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/empty_links.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/feature.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/feature.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/feature.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/feature.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/full_name.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/full_name.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/full_name.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/full_name.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/increase_font_size.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/increase_font_size.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/increase_font_size.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/increase_font_size.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/inv_aggreg.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/inv_aggreg.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/inv_aggreg.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/inv_aggreg.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/link.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_type.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_type.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_type.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_type.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir_facet.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir_facet.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir_facet.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/link_unidir_facet.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/multiplicity.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/multiplicity.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/multiplicity.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/multiplicity.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/non-zero.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/non-zero.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/non-zero.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/non-zero.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/operation.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/operation.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/operation.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/operation.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/opposite_links.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/opposite_links.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/opposite_links.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/opposite_links.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/ordering.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/ordering.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/ordering.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/ordering.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/package.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/package.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/package.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/package.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/predicate.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/predicate.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/predicate.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/predicate.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/range.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/range.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/range.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/range.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/remove_line.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/remove_line.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/remove_line.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/remove_line.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/restore_font_size.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/restore_font_size.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/restore_font_size.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/restore_font_size.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/select_columns_to_hide.png b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/select_columns_to_hide.png
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/select_columns_to_hide.png
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/select_columns_to_hide.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links_by_type.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links_by_type.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links_by_type.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_links_by_type.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_num.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_num.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_num.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/sort_num.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/uri.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/uri.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/uri.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/uri.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/view_menu.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/view_menu.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/view_menu.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/view_menu.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/full/ctool16/zero.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/zero.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/full/ctool16/zero.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/full/ctool16/zero.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/logoMoDiscoMini.gif b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/logoMoDiscoMini.gif
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/logoMoDiscoMini.gif
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/logoMoDiscoMini.gif
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/query.png b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/query.png
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/query.png
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/query.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/icons/shortcut.png b/plugins/facet/org.eclipse.modisco.facet.widgets/icons/shortcut.png
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/icons/shortcut.png
rename to plugins/facet/org.eclipse.modisco.facet.widgets/icons/shortcut.png
Binary files differ
diff --git a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java b/plugins/facet/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/Activator.java
diff --git a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java b/plugins/facet/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/CustomizableLabelProvider.java
diff --git a/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java b/plugins/facet/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java
similarity index 100%
rename from org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java
rename to plugins/facet/org.eclipse.modisco.facet.widgets/src/org/eclipse/modisco/facet/widgets/internal/ImageProvider.java
diff --git a/plugins/facet/pom.xml b/plugins/facet/pom.xml
new file mode 100644
index 0000000..ff42f10
--- /dev/null
+++ b/plugins/facet/pom.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.eclipse.modisco</groupId>
+ <artifactId>org.eclipse.modisco.releng.tycho</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ <relativePath>../../releng/org.eclipse.modisco.releng.tycho</relativePath>
+ </parent>
+ <groupId>org.eclipse.modisco-plugins.facet</groupId>
+ <artifactId>org.eclipse.modisco.plugins.facet-folder</artifactId>
+ <version>1.5.2-SNAPSHOT</version>
+ <packaging>pom</packaging>
+
+ <modules>
+ <!-- EMF Facet Plugins -->
+ <module>org.eclipse.modisco.facet.common.core</module>
+ <module>org.eclipse.modisco.facet.common.ui</module>
+ <module>org.eclipse.modisco.facet.custom.core</module>
+ <module>org.eclipse.modisco.facet.custom.metamodel</module>
+ <module>org.eclipse.modisco.facet.custom.ui</module>
+ <module>org.eclipse.modisco.facet.efacet.core</module>
+ <module>org.eclipse.modisco.facet.efacet.edit.core</module>
+ <module>org.eclipse.modisco.facet.efacet.metamodel</module>
+ <module>org.eclipse.modisco.facet.efacet.ui</module>
+ <module>org.eclipse.modisco.facet.query.java.core</module>
+ <module>org.eclipse.modisco.facet.query.java.metamodel</module>
+ <module>org.eclipse.modisco.facet.util.core</module>
+ <module>org.eclipse.modisco.facet.util.emf.catalog</module>
+ <module>org.eclipse.modisco.facet.util.emf.catalog.metamodel</module>
+ <module>org.eclipse.modisco.facet.util.emf.core</module>
+ <module>org.eclipse.modisco.facet.util.emf.ui</module>
+ <module>org.eclipse.modisco.facet.util.jface.ui</module>
+ <module>org.eclipse.modisco.facet.util.pde.core</module>
+ <module>org.eclipse.modisco.facet.util.swt</module>
+ <module>org.eclipse.modisco.facet.util.ui</module>
+ <module>org.eclipse.modisco.facet.widgets</module>
+ <module>org.eclipse.modisco.facet.widgets.celleditors</module>
+ <module>org.eclipse.modisco.facet.widgets.celleditors.ecore</module>
+ </modules>
+
+</project>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 158a4d6..4c22a69 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,30 +15,6 @@
<packaging>pom</packaging>
<modules>
- <!-- EMF Facet Plugins -->
- <module>org.eclipse.modisco.facet.common.core</module>
- <module>org.eclipse.modisco.facet.common.ui</module>
- <module>org.eclipse.modisco.facet.custom.core</module>
- <module>org.eclipse.modisco.facet.custom.metamodel</module>
- <module>org.eclipse.modisco.facet.custom.ui</module>
- <module>org.eclipse.modisco.facet.efacet.core</module>
- <module>org.eclipse.modisco.facet.efacet.edit.core</module>
- <module>org.eclipse.modisco.facet.efacet.metamodel</module>
- <module>org.eclipse.modisco.facet.efacet.ui</module>
- <module>org.eclipse.modisco.facet.query.java.core</module>
- <module>org.eclipse.modisco.facet.query.java.metamodel</module>
- <module>org.eclipse.modisco.facet.util.core</module>
- <module>org.eclipse.modisco.facet.util.emf.catalog</module>
- <module>org.eclipse.modisco.facet.util.emf.catalog.metamodel</module>
- <module>org.eclipse.modisco.facet.util.emf.core</module>
- <module>org.eclipse.modisco.facet.util.emf.ui</module>
- <module>org.eclipse.modisco.facet.util.jface.ui</module>
- <module>org.eclipse.modisco.facet.util.pde.core</module>
- <module>org.eclipse.modisco.facet.util.swt</module>
- <module>org.eclipse.modisco.facet.util.ui</module>
- <module>org.eclipse.modisco.facet.widgets</module>
- <module>org.eclipse.modisco.facet.widgets.celleditors</module>
- <module>org.eclipse.modisco.facet.widgets.celleditors.ecore</module>
<!-- GMT MoDisco Plugins -->
<module>org.eclipse.modisco.examples</module>
<module>org.eclipse.modisco.infra.browser</module>
diff --git a/releng/org.eclipse.modisco.releng.tycho/pom.xml b/releng/org.eclipse.modisco.releng.tycho/pom.xml
index cd32368..d54144c 100644
--- a/releng/org.eclipse.modisco.releng.tycho/pom.xml
+++ b/releng/org.eclipse.modisco.releng.tycho/pom.xml
@@ -74,6 +74,7 @@
<module>../..</module>
<module>../../doc</module>
<module>../../features</module>
+ <module>../../plugins/facet</module>
<module>../../releng</module>
<module>../../tests</module>
</modules>
