Step 3 package name refactoring

author: Michael Jastram 2012-10-25 14:31:36 +0000
committer: Michael Jastram 2012-10-25 14:31:36 +0000
commit: db783c1003d31f694a69d2378e0485181a3a34d1 (patch)
tree: e3cb2fb042525aa2ffc8e385c44a18867782878e
parent: 05c84b6a10606c110b19e1080fe3789bb0a341a0 (diff)
download: org.eclipse.rmf-db783c1003d31f694a69d2378e0485181a3a34d1.tar.gz
org.eclipse.rmf-db783c1003d31f694a69d2378e0485181a3a34d1.tar.xz
org.eclipse.rmf-db783c1003d31f694a69d2378e0485181a3a34d1.zip
180 files changed, 292 insertions, 300 deletions
diff --git a/org.eclipse.rmf.pror.reqif10.feature/feature.xml b/org.eclipse.rmf.pror.reqif10.feature/feature.xml
index f54f8353..ee9d2589 100644
--- a/org.eclipse.rmf.pror.reqif10.feature/feature.xml
+++ b/org.eclipse.rmf.pror.reqif10.feature/feature.xml
@@ -62,7 +62,7 @@ Contributors:
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.rmf.pror.reqif10.presentation.id"
+         id="org.eclipse.rmf.reqif10.pror.presentation.id"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.rmf.pror.reqif10.genhtml/META-INF/MANIFEST.MF b/org.eclipse.rmf.pror.reqif10.genhtml/META-INF/MANIFEST.MF
index 3b15198e..dee396e1 100644
--- a/org.eclipse.rmf.pror.reqif10.genhtml/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.pror.reqif10.genhtml/META-INF/MANIFEST.MF
@@ -8,8 +8,8 @@ Bundle-Activator: org.eclipse.rmf.pror.reqif10.genhtml.Activator
 Require-Bundle: org.eclipse.core.runtime,
  org.eclipse.rmf.reqif10;bundle-version="0.4.0",
  org.eclipse.rmf.serialization;bundle-version="0.4.0",
- org.eclipse.rmf.pror.reqif10.presentation.headline;bundle-version="0.4.0",
- org.eclipse.rmf.pror.reqif10.presentation.id;bundle-version="0.4.0",
+ org.eclipse.rmf.reqif10.pror.presentation.headline;bundle-version="0.4.0",
+ org.eclipse.rmf.reqif10.pror.presentation.id;bundle-version="0.4.0",
  org.eclipse.rmf.pror.reqif10.presentation.linewrap;bundle-version="0.4.0",
  org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.4.0"
 Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.rmf.pror.reqif10.genhtml/src/org/eclipse/rmf/pror/reqif10/genhtml/GenerateHtml.java b/org.eclipse.rmf.pror.reqif10.genhtml/src/org/eclipse/rmf/pror/reqif10/genhtml/GenerateHtml.java
index 08a97341..33f70a61 100644
--- a/org.eclipse.rmf.pror.reqif10.genhtml/src/org/eclipse/rmf/pror/reqif10/genhtml/GenerateHtml.java
+++ b/org.eclipse.rmf.pror.reqif10.genhtml/src/org/eclipse/rmf/pror/reqif10/genhtml/GenerateHtml.java
@@ -26,9 +26,7 @@ import org.eclipse.emf.edit.domain.AdapterFactoryEditingDomain;
 import org.eclipse.emf.edit.provider.ComposedAdapterFactory;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
-import org.eclipse.rmf.pror.presentation.headline.util.HeadlineAdapterFactory;
 import org.eclipse.rmf.pror.presentation.linewrap.util.LinewrapAdapterFactory;
-import org.eclipse.rmf.pror.reqif10.presentation.id.util.IdAdapterFactory;
 import org.eclipse.rmf.pror.reqif10.provider.ReqIF10ItemProviderAdapterFactory;
 import org.eclipse.rmf.pror.reqif10.xhtml.provider.XhtmlItemProviderAdapterFactory;
 import org.eclipse.rmf.reqif10.ReqIF;
@@ -36,6 +34,8 @@ import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.Specification;
 import org.eclipse.rmf.reqif10.pror.configuration.util.ConfigurationAdapterFactory;
 import org.eclipse.rmf.reqif10.pror.editor.util.ProrEditorUtil;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.util.HeadlineAdapterFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.id.util.IdAdapterFactory;
 import org.eclipse.rmf.serialization.ReqIFResourceFactoryImpl;
 import org.eclipse.rmf.serialization.ReqIFResourceImpl;
 import org.eclipse.rmf.serialization.ReqIFResourceSetImpl;
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/META-INF/MANIFEST.MF b/org.eclipse.rmf.pror.reqif10.presentation.headline/META-INF/MANIFEST.MF
deleted file mode 100644
index e4bd1181..00000000
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,18 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rmf.pror.reqif10.presentation.headline;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.rmf.pror.presentation.headline.provider.HeadlineEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Export-Package: 
- org.eclipse.rmf.pror.presentation.headline,
- org.eclipse.rmf.pror.presentation.headline.impl,
- org.eclipse.rmf.pror.presentation.headline.provider,
- org.eclipse.rmf.pror.presentation.headline.ui,
- org.eclipse.rmf.pror.presentation.headline.util
-Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.4.0"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/.project b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/.project
index 420f4b7f..0032b4b2 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/.project
+++ b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.rmf.pror.reqif10.presentation.id.tests</name>
+	<name>org.eclipse.rmf.reqif10.pror.presentation.id.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/META-INF/MANIFEST.MF
index d71aad31..b81b92fd 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rmf.pror.reqif10.presentation.id.tests
+Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.id.tests
 Bundle-Version: 0.4.0.qualifier
 Bundle-Localization: plugin
-Fragment-Host: org.eclipse.rmf.pror.reqif10.presentation.id
+Fragment-Host: org.eclipse.rmf.reqif10.pror.presentation.id
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-Vendor: %providerName
-Require-Bundle: org.eclipse.rmf.pror.reqif10.tests;bundle-version="0.4.0",
+Require-Bundle: org.eclipse.rmf.reqif10.pror.tests;bundle-version="0.4.0",
  org.junit;bundle-version="4.8.2"
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/pom.xml b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/pom.xml
index 719c7693..7adb5681 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/pom.xml
+++ b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.rmf.plugins</groupId>
-	<artifactId>org.eclipse.rmf.pror.reqif10.presentation.id.tests</artifactId>
+	<artifactId>org.eclipse.rmf.reqif10.pror.presentation.id.tests</artifactId>
 	<version>0.4.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/tests/org/eclipse/rmf/pror/reqif10/presentation/id/tests/IdConfigurationTest.java b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/tests/org/eclipse/rmf/pror/reqif10/presentation/id/tests/IdConfigurationTest.java
index ca4e8ce8..395da497 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id.tests/tests/org/eclipse/rmf/pror/reqif10/presentation/id/tests/IdConfigurationTest.java
+++ b/org.eclipse.rmf.pror.reqif10.presentation.id.tests/tests/org/eclipse/rmf/pror/reqif10/presentation/id/tests/IdConfigurationTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.pror.reqif10.presentation.id.tests;
 
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdFactory;
 import org.eclipse.rmf.reqif10.configuration.tests.ProrPresentationConfigurationTest;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/META-INF/MANIFEST.MF b/org.eclipse.rmf.pror.reqif10.presentation.id/META-INF/MANIFEST.MF
deleted file mode 100644
index 95fe787a..00000000
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/META-INF/MANIFEST.MF
+++ /dev/null
@@ -1,17 +0,0 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rmf.pror.reqif10.presentation.id;singleton:=true
-Bundle-Version: 0.4.0.qualifier
-Bundle-ClassPath: .
-Bundle-Activator: org.eclipse.rmf.pror.reqif10.presentation.id.provider.IDEditPlugin$Implementation
-Bundle-Vendor: %providerName
-Bundle-Localization: plugin
-Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Export-Package: org.eclipse.rmf.pror.reqif10.presentation.id,
- org.eclipse.rmf.pror.reqif10.presentation.id.impl,
- org.eclipse.rmf.pror.reqif10.presentation.id.provider,
- org.eclipse.rmf.pror.reqif10.presentation.id.util,
- org.eclipse.rmf.pror.reqif10.presentation.ui
-Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.4.0"
-Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.rmf.pror.reqif10.sdk.feature/feature.xml b/org.eclipse.rmf.pror.reqif10.sdk.feature/feature.xml
index 8e9998f5..38605af7 100644
--- a/org.eclipse.rmf.pror.reqif10.sdk.feature/feature.xml
+++ b/org.eclipse.rmf.pror.reqif10.sdk.feature/feature.xml
@@ -66,7 +66,7 @@ Contributors:
          unpack="false"/>
 
    <plugin
-         id="org.eclipse.rmf.pror.reqif10.presentation.id.source"
+         id="org.eclipse.rmf.reqif10.pror.presentation.id.source"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/org.eclipse.rmf.pror.reqif10.tests/plugin.xml b/org.eclipse.rmf.pror.reqif10.tests/plugin.xml
deleted file mode 100644
index 5535690d..00000000
--- a/org.eclipse.rmf.pror.reqif10.tests/plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
-</plugin>
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF
index 3797be49..18dfde5b 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/META-INF/MANIFEST.MF
@@ -5,4 +5,4 @@ Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.editor.tests
 Bundle-Version: 0.3.2.qualifier
 Fragment-Host: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.3.2"
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Require-Bundle: org.eclipse.rmf.pror.reqif10.tests;bundle-version="0.3.2"
+Require-Bundle: org.eclipse.rmf.reqif10.pror.tests;bundle-version="0.3.2"
diff --git a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java
index d99e6354..fb3b5efc 100644
--- a/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java
+++ b/org.eclipse.rmf.reqif10.pror.editor.tests/src/org/eclipse/rmf/reqif10/pror/editor/agilegrid/AbstractContentProviderTests.java
@@ -14,7 +14,6 @@ import static org.junit.Assert.*;
 
 import java.net.URISyntaxException;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
 import org.eclipse.rmf.reqif10.SpecObject;
@@ -24,6 +23,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrSpecViewConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
 import org.eclipse.rmf.reqif10.pror.editor.agilegrid.ProrAgileGridContentProvider;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/.classpath b/org.eclipse.rmf.reqif10.pror.presentation.headline/.classpath
index 2d1a4302..2d1a4302 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/.classpath
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/.classpath
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/.gitignore b/org.eclipse.rmf.reqif10.pror.presentation.headline/.gitignore
index c6048b6a..c6048b6a 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/.gitignore
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/.gitignore
diff --git a/org.eclipse.rmf.pror.reqif10.tests/.project b/org.eclipse.rmf.reqif10.pror.presentation.headline/.project
index e1dcbfeb..923f9a4e 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/.project
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/.project
@@ -1,28 +1,28 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>org.eclipse.rmf.pror.reqif10.tests</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.eclipse.rmf.reqif10.pror.presentation.headline</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.eclipse.pde.PluginNature</nature>
+	</natures>
+</projectDescription>
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.reqif10.pror.presentation.headline/.settings/org.eclipse.jdt.core.prefs
index 4773f25d..4773f25d 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/LICENSE.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/LICENSE.html
index 2eb14eb9..2eb14eb9 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/LICENSE.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/LICENSE.html
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..5b435f17
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/META-INF/MANIFEST.MF
@@ -0,0 +1,18 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.headline;singleton:=true
+Bundle-Version: 0.4.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.rmf.reqif10.pror.presentation.headline.provider.HeadlineEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Export-Package: 
+ org.eclipse.rmf.reqif10.pror.presentation.headline,
+ org.eclipse.rmf.reqif10.pror.presentation.headline.impl,
+ org.eclipse.rmf.reqif10.pror.presentation.headline.provider,
+ org.eclipse.rmf.reqif10.pror.presentation.headline.ui,
+ org.eclipse.rmf.reqif10.pror.presentation.headline.util
+Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.4.0"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/about.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/about.html
index f47dbddb..f47dbddb 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/about.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/about.html
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/build.properties b/org.eclipse.rmf.reqif10.pror.presentation.headline/build.properties
index 1e86dd84..1e86dd84 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/build.properties
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/epl-v10.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/epl-v10.html
index 813c07d8..813c07d8 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/epl-v10.html
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/Column.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/Column.png
index e8d2c7b0..e8d2c7b0 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/Column.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/Column.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRGeneralConfiguration_labelConfiguration_LabelConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRGeneralConfiguration_labelConfiguration_LabelConfiguration.gif
index 8cd9cfa9..8cd9cfa9 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRGeneralConfiguration_labelConfiguration_LabelConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRGeneralConfiguration_labelConfiguration_LabelConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRSpecViewConfiguration_columns_Column.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRSpecViewConfiguration_columns_Column.gif
index d5cbc02e..d5cbc02e 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRSpecViewConfiguration_columns_Column.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRSpecViewConfiguration_columns_Column.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRToolExtension_generalConfiguration_ProRGeneralConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRToolExtension_generalConfiguration_ProRGeneralConfiguration.gif
index d9318b15..d9318b15 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRToolExtension_generalConfiguration_ProRGeneralConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRToolExtension_generalConfiguration_ProRGeneralConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRToolExtension_presentationConfigurations_ProRPresentationConfigurations.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRToolExtension_presentationConfigurations_ProRPresentationConfigurations.gif
index cab007e1..cab007e1 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRToolExtension_presentationConfigurations_ProRPresentationConfigurations.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRToolExtension_presentationConfigurations_ProRPresentationConfigurations.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRToolExtension_specViewConfigurations_ProRSpecViewConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRToolExtension_specViewConfigurations_ProRSpecViewConfiguration.gif
index 53920110..53920110 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/CreateProRToolExtension_specViewConfigurations_ProRSpecViewConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/CreateProRToolExtension_specViewConfigurations_ProRSpecViewConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/ProRPresentationConfiguration.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/ProRPresentationConfiguration.png
index 225a6f07..225a6f07 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/ProRPresentationConfiguration.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/ProRPresentationConfiguration.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/ProRSpecViewConfiguration.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/ProRSpecViewConfiguration.png
index 6225344f..6225344f 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/ProRSpecViewConfiguration.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/ProRSpecViewConfiguration.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/ReqIFUIToolExtension.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/ReqIFUIToolExtension.png
index 35b7b181..35b7b181 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/ctool16/ReqIFUIToolExtension.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/ctool16/ReqIFUIToolExtension.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/Column.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/Column.gif
index 136e3b27..136e3b27 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/Column.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/Column.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/HeadlineConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/HeadlineConfiguration.gif
index 89ad5da3..89ad5da3 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/HeadlineConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/HeadlineConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/LabelConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/LabelConfiguration.gif
index 90415988..90415988 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/LabelConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/LabelConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.gif
index c4a8af41..c4a8af41 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.png
index 35b7b181..35b7b181 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRGeneralConfiguration.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRPresentationConfiguration.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRPresentationConfiguration.png
index 225a6f07..225a6f07 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRPresentationConfiguration.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRPresentationConfiguration.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRPresentationConfigurations.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRPresentationConfigurations.gif
index 134551bf..134551bf 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRPresentationConfigurations.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRPresentationConfigurations.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.gif
index c4fb30e9..c4fb30e9 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.png b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.png
index 6225344f..6225344f 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.png
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRSpecViewConfiguration.png
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRToolExtension.gif b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRToolExtension.gif
index c8d381f0..c8d381f0 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/icons/full/obj16/ProRToolExtension.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/icons/full/obj16/ProRToolExtension.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/model/Headline.ecore b/org.eclipse.rmf.reqif10.pror.presentation.headline/model/Headline.ecore
index eaf7f014..eaf7f014 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/model/Headline.ecore
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/model/Headline.ecore
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/model/Headline.genmodel b/org.eclipse.rmf.reqif10.pror.presentation.headline/model/Headline.genmodel
index 2da9c34d..3d0076d3 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/model/Headline.genmodel
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/model/Headline.genmodel
@@ -2,13 +2,13 @@
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
     xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="/org.eclipse.rmf.pror.reqif10.presentation.headline/src"
-    editDirectory="/org.eclipse.rmf.pror.reqif10.presentation.headline/src" editorDirectory="/org.eclipse.rmf.pror.presentation.headline.editor/src"
+    editDirectory="/org.eclipse.rmf.pror.reqif10.presentation.headline/src" editorDirectory="/org.eclipse.rmf.reqif10.pror.presentation.headline.editor/src"
     modelPluginID="org.eclipse.rmf.pror.reqif10.presentation.headline" modelName="Headline"
-    editPluginClass="org.eclipse.rmf.pror.presentation.headline.provider.HeadlineEditPlugin"
-    editorPluginClass="org.eclipse.rmf.pror.presentation.headline.presentation.HeadlineEditorPlugin"
-    testSuiteClass="org.eclipse.rmf.pror.presentation.headline.tests.HeadlineAllTests"
+    editPluginClass="org.eclipse.rmf.reqif10.pror.presentation.headline.provider.HeadlineEditPlugin"
+    editorPluginClass="org.eclipse.rmf.reqif10.pror.presentation.headline.presentation.HeadlineEditorPlugin"
+    testSuiteClass="org.eclipse.rmf.reqif10.pror.presentation.headline.tests.HeadlineAllTests"
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    editPluginID="org.eclipse.rmf.pror.reqif10.presentation.headline" editorPluginID="org.eclipse.rmf.pror.presentation.headline.editor"
+    editPluginID="org.eclipse.rmf.pror.reqif10.presentation.headline" editorPluginID="org.eclipse.rmf.reqif10.pror.presentation.headline.editor"
     usedGenPackages="../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//configuration ../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//reqif10 ../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//reqif10/datatypes">
   <foreignModel>Headline.ecore</foreignModel>
   <genPackages prefix="Headline" basePackage="org.eclipse.rmf.pror.presentation" disposableProviderFactory="true"
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/notice.html b/org.eclipse.rmf.reqif10.pror.presentation.headline/notice.html
index 5ef68115..5ef68115 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/notice.html
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/plugin.properties b/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.properties
index 8d7c1eae..8d7c1eae 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.properties
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/plugin.xml b/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.xml
index 562339a3..faf05c86 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/plugin.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/plugin.xml
@@ -21,7 +21,7 @@ Contributors:
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <factory
             uri="http://pror.org/presentation/headline"
-            class="org.eclipse.rmf.pror.presentation.headline.provider.HeadlineItemProviderAdapterFactory"
+            class="org.eclipse.rmf.reqif10.pror.presentation.headline.provider.HeadlineItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -33,14 +33,14 @@ Contributors:
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://pror.org/presentation/headline"
-            class="org.eclipse.rmf.pror.presentation.headline.HeadlinePackage"
+            class="org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage"
             genModel="model/Headline.genmodel"/>
    </extension>
  <extension
          point="org.eclipse.rmf.reqif10.pror.editor.presentation">
       <presentation
             name="Headline"
-            service="org.eclipse.rmf.pror.presentation.headline.ui.HeadlinePresentationService">
+            service="org.eclipse.rmf.reqif10.pror.presentation.headline.ui.HeadlinePresentationService">
       </presentation>
    </extension>
 
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/pom.xml b/org.eclipse.rmf.reqif10.pror.presentation.headline/pom.xml
index f2b76268..f2b76268 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/pom.xml
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/HeadlineConfiguration.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineConfiguration.java
index aa21e8da..ed378ed0 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/HeadlineConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineConfiguration.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline;
+package org.eclipse.rmf.reqif10.pror.presentation.headline;
 
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 
@@ -22,11 +22,11 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration#getSize <em>Size</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration#getSize <em>Size</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.rmf.pror.presentation.headline.HeadlinePackage#getHeadlineConfiguration()
+ * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage#getHeadlineConfiguration()
  * @model
  * @generated
  */
@@ -42,14 +42,14 @@ public interface HeadlineConfiguration extends ProrPresentationConfiguration {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Size</em>' attribute.
 	 * @see #setSize(int)
-	 * @see org.eclipse.rmf.pror.presentation.headline.HeadlinePackage#getHeadlineConfiguration_Size()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage#getHeadlineConfiguration_Size()
 	 * @model default="14" required="true"
 	 * @generated
 	 */
 	int getSize();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration#getSize <em>Size</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration#getSize <em>Size</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Size</em>' attribute.
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/HeadlineFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineFactory.java
index 57682571..829206dd 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/HeadlineFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlineFactory.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline;
+package org.eclipse.rmf.reqif10.pror.presentation.headline;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.presentation.headline.HeadlinePackage
+ * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage
  * @generated
  */
 public interface HeadlineFactory extends EFactory {
@@ -28,7 +28,7 @@ public interface HeadlineFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	HeadlineFactory eINSTANCE = org.eclipse.rmf.pror.presentation.headline.impl.HeadlineFactoryImpl.init();
+	HeadlineFactory eINSTANCE = org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlineFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Configuration</em>'.
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/HeadlinePackage.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlinePackage.java
index a91864a5..8115a5c8 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/HeadlinePackage.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/HeadlinePackage.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline;
+package org.eclipse.rmf.reqif10.pror.presentation.headline;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -27,7 +27,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.presentation.headline.HeadlineFactory
+ * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory
  * @model kind="package"
  * @generated
  */
@@ -62,14 +62,14 @@ public interface HeadlinePackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	HeadlinePackage eINSTANCE = org.eclipse.rmf.pror.presentation.headline.impl.HeadlinePackageImpl.init();
+	HeadlinePackage eINSTANCE = org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlinePackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.pror.presentation.headline.impl.HeadlineConfigurationImpl <em>Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlineConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.rmf.pror.presentation.headline.impl.HeadlineConfigurationImpl
-	 * @see org.eclipse.rmf.pror.presentation.headline.impl.HeadlinePackageImpl#getHeadlineConfiguration()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlineConfigurationImpl
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlinePackageImpl#getHeadlineConfiguration()
 	 * @generated
 	 */
 	int HEADLINE_CONFIGURATION = 0;
@@ -103,21 +103,21 @@ public interface HeadlinePackage extends EPackage {
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration <em>Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Configuration</em>'.
-	 * @see org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration
 	 * @generated
 	 */
 	EClass getHeadlineConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration#getSize <em>Size</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration#getSize <em>Size</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Size</em>'.
-	 * @see org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration#getSize()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration#getSize()
 	 * @see #getHeadlineConfiguration()
 	 * @generated
 	 */
@@ -146,11 +146,11 @@ public interface HeadlinePackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.pror.presentation.headline.impl.HeadlineConfigurationImpl <em>Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlineConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.rmf.pror.presentation.headline.impl.HeadlineConfigurationImpl
-		 * @see org.eclipse.rmf.pror.presentation.headline.impl.HeadlinePackageImpl#getHeadlineConfiguration()
+		 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlineConfigurationImpl
+		 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlinePackageImpl#getHeadlineConfiguration()
 		 * @generated
 		 */
 		EClass HEADLINE_CONFIGURATION = eINSTANCE.getHeadlineConfiguration();
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/impl/HeadlineConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineConfigurationImpl.java
index 55f81004..8d631085 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/impl/HeadlineConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineConfigurationImpl.java
@@ -9,14 +9,14 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.impl;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlinePackage;
 import org.eclipse.rmf.reqif10.pror.configuration.impl.ProrPresentationConfigurationImpl;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -25,7 +25,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.impl.ProrPresentationConfigura
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.pror.presentation.headline.impl.HeadlineConfigurationImpl#getSize <em>Size</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.headline.impl.HeadlineConfigurationImpl#getSize <em>Size</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/impl/HeadlineFactoryImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineFactoryImpl.java
index 2590668f..73e875c6 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/impl/HeadlineFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlineFactoryImpl.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.impl;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EObject;
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.rmf.pror.presentation.headline.*;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.*;
 
 
 /**
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/impl/HeadlinePackageImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlinePackageImpl.java
index 369bca2b..b9487864 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/impl/HeadlinePackageImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/impl/HeadlinePackageImpl.java
@@ -9,18 +9,18 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.impl;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineFactory;
-import org.eclipse.rmf.pror.presentation.headline.HeadlinePackage;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -47,7 +47,7 @@ public class HeadlinePackageImpl extends EPackageImpl implements HeadlinePackage
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.rmf.pror.presentation.headline.HeadlinePackage#eNS_URI
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java
index 3ee016d1..3ccd88b2 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineConfigurationItemProvider.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.provider;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.provider;
 
 
 import java.util.Collection;
@@ -37,9 +37,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlinePackage;
-import org.eclipse.rmf.pror.presentation.headline.ui.HeadlineCellRenderer;
 import org.eclipse.rmf.reqif10.AttributeValue;
 import org.eclipse.rmf.reqif10.DatatypeDefinition;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
@@ -49,10 +46,13 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrPresentationConfigurationItemProvider;
 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.IProrCellRenderer;
 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.PresentationEditorInterface;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.ui.HeadlineCellRenderer;
 import org.eclipse.rmf.reqif10.util.ReqIF10Switch;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/provider/HeadlineEditPlugin.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineEditPlugin.java
index 3cbf4888..b5bd5ca6 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/provider/HeadlineEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineEditPlugin.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.provider;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java
index 064dc112..72050d19 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/provider/HeadlineItemProviderAdapterFactory.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.provider;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -29,7 +29,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.rmf.pror.presentation.headline.util.HeadlineAdapterFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.util.HeadlineAdapterFactory;
 
 
 /**
@@ -81,7 +81,7 @@ public class HeadlineItemProviderAdapterFactory extends HeadlineAdapterFactory i
 	}
 
 	/**
-	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration} instances.
+	 * This keeps track of the one adapter used for all {@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration} instances.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
@@ -89,7 +89,7 @@ public class HeadlineItemProviderAdapterFactory extends HeadlineAdapterFactory i
 	protected HeadlineConfigurationItemProvider headlineConfigurationItemProvider;
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/ui/HeadlineCellRenderer.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlineCellRenderer.java
index 8395a9a7..12aecb78 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/ui/HeadlineCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlineCellRenderer.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.presentation.headline.ui;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.ui;
 
 import org.eclipse.jface.resource.FontRegistry;
 import org.eclipse.jface.resource.JFaceResources;
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/ui/HeadlinePresentationService.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlinePresentationService.java
index 7780d257..a459a38e 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/ui/HeadlinePresentationService.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/ui/HeadlinePresentationService.java
@@ -8,11 +8,11 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.presentation.headline.ui;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.ui;
 
-import org.eclipse.rmf.pror.presentation.headline.HeadlineFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.AbstractPresentationService;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory;
 
 public class HeadlinePresentationService extends AbstractPresentationService {
 
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/util/HeadlineAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineAdapterFactory.java
index d5d60023..cb54a4e1 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/util/HeadlineAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineAdapterFactory.java
@@ -9,22 +9,22 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.util;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlinePackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.presentation.headline.HeadlinePackage
+ * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage
  * @generated
  */
 public class HeadlineAdapterFactory extends AdapterFactoryImpl {
@@ -104,13 +104,13 @@ public class HeadlineAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration <em>Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration
 	 * @generated
 	 */
 	public Adapter createHeadlineConfigurationAdapter() {
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/util/HeadlineSwitch.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineSwitch.java
index d5168a80..789dacff 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/util/HeadlineSwitch.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/util/HeadlineSwitch.java
@@ -9,14 +9,14 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.util;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlinePackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -28,7 +28,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.presentation.headline.HeadlinePackage
+ * @see org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage
  * @generated
  */
 public class HeadlineSwitch<T> extends Switch<T> {
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/validation/HeadlineConfigurationValidator.java b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/validation/HeadlineConfigurationValidator.java
index 6c26245a..c9add3fa 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/src/org/eclipse/rmf/pror/presentation/headline/validation/HeadlineConfigurationValidator.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/src/org/eclipse/rmf/reqif10/pror/presentation/headline/validation/HeadlineConfigurationValidator.java
@@ -9,11 +9,11 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.presentation.headline.validation;
+package org.eclipse.rmf.reqif10.pror.presentation.headline.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration}.
+ * A sample validator interface for {@link org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/text/description.txt b/org.eclipse.rmf.reqif10.pror.presentation.headline/text/description.txt
index cc5c8c14..cc5c8c14 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/text/description.txt
+++ b/org.eclipse.rmf.reqif10.pror.presentation.headline/text/description.txt
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/.classpath b/org.eclipse.rmf.reqif10.pror.presentation.id/.classpath
index 45f024e8..45f024e8 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/.classpath
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/.classpath
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/.gitignore b/org.eclipse.rmf.reqif10.pror.presentation.id/.gitignore
index c6048b6a..c6048b6a 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/.gitignore
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/.gitignore
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/.project b/org.eclipse.rmf.reqif10.pror.presentation.id/.project
index 3ccd20cb..595b3050 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/.project
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.rmf.pror.reqif10.presentation.id</name>
+	<name>org.eclipse.rmf.reqif10.pror.presentation.id</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.reqif10.pror.presentation.id/.settings/org.eclipse.jdt.core.prefs
index 449d4d3e..449d4d3e 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF
new file mode 100644
index 00000000..628eaaa7
--- /dev/null
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/META-INF/MANIFEST.MF
@@ -0,0 +1,17 @@
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: %pluginName
+Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.presentation.id;singleton:=true
+Bundle-Version: 0.4.0.qualifier
+Bundle-ClassPath: .
+Bundle-Activator: org.eclipse.rmf.reqif10.pror.presentation.id.provider.IDEditPlugin$Implementation
+Bundle-Vendor: %providerName
+Bundle-Localization: plugin
+Bundle-RequiredExecutionEnvironment: J2SE-1.5
+Export-Package: org.eclipse.rmf.reqif10.pror.presentation.id,
+ org.eclipse.rmf.reqif10.pror.presentation.id.impl,
+ org.eclipse.rmf.reqif10.pror.presentation.id.provider,
+ org.eclipse.rmf.reqif10.pror.presentation.id.util,
+ org.eclipse.rmf.reqif10.pror.presentation.ui
+Require-Bundle: org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.4.0"
+Bundle-ActivationPolicy: lazy
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/about.html b/org.eclipse.rmf.reqif10.pror.presentation.id/about.html
index f47dbddb..f47dbddb 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/about.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/about.html
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/build.properties b/org.eclipse.rmf.reqif10.pror.presentation.id/build.properties
index 774a84db..774a84db 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/build.properties
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/epl-v10.html b/org.eclipse.rmf.reqif10.pror.presentation.id/epl-v10.html
index 813c07d8..813c07d8 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/epl-v10.html
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/icons/full/obj16/IdConfiguration.gif b/org.eclipse.rmf.reqif10.pror.presentation.id/icons/full/obj16/IdConfiguration.gif
index 94c953e0..94c953e0 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/icons/full/obj16/IdConfiguration.gif
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/icons/full/obj16/IdConfiguration.gif
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/model/ID.ecore b/org.eclipse.rmf.reqif10.pror.presentation.id/model/ID.ecore
index 48649512..48649512 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/model/ID.ecore
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/model/ID.ecore
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/model/ID.genmodel b/org.eclipse.rmf.reqif10.pror.presentation.id/model/ID.genmodel
index d82da58b..ae5a59a6 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/model/ID.genmodel
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/model/ID.genmodel
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <genmodel:GenModel xmi:version="2.0"
     xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore"
-    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="org.eclipse.rmf.pror.reqif10.presentation.id/src"
-    editDirectory="/org.eclipse.rmf.pror.reqif10.presentation.id/src" editorDirectory="/org.eclipse.rmf.pror.reqif10.presentation.id.editor/src"
-    modelPluginID="org.eclipse.rmf.pror.reqif10.presentation.id" modelName="ID" modelPluginClass=""
-    editPluginClass="org.eclipse.rmf.pror.reqif10.presentation.id.provider.IDEditPlugin"
-    testsDirectory="/org.eclipse.rmf.pror.reqif10.presentation.id.tests/tests" testSuiteClass=""
+    xmlns:genmodel="http://www.eclipse.org/emf/2002/GenModel" modelDirectory="org.eclipse.rmf.reqif10.pror.presentation.id/src"
+    editDirectory="/org.eclipse.rmf.reqif10.pror.presentation.id/src" editorDirectory="/org.eclipse.rmf.reqif10.pror.presentation.id.editor/src"
+    modelPluginID="org.eclipse.rmf.reqif10.pror.presentation.id" modelName="ID" modelPluginClass=""
+    editPluginClass="org.eclipse.rmf.reqif10.pror.presentation.id.provider.IDEditPlugin"
+    testsDirectory="/org.eclipse.rmf.reqif10.pror.presentation.id.tests/tests" testSuiteClass=""
     importerID="org.eclipse.emf.importer.ecore" complianceLevel="6.0" copyrightFields="false"
-    editPluginID="org.eclipse.rmf.pror.reqif10.presentation.id" editorPluginID="org.eclipse.rmf.pror.reqif10.presentation.id.editor"
+    editPluginID="org.eclipse.rmf.reqif10.pror.presentation.id" editorPluginID="org.eclipse.rmf.reqif10.pror.presentation.id.editor"
     usedGenPackages="../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//configuration ../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//reqif10 ../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//xhtml platform:/plugin/org.eclipse.emf.ecore/model/XMLNamespace.genmodel#//namespace ../../org.eclipse.rmf.pror.reqif10/model/reqif10.genmodel#//datatypes">
   <foreignModel>ID.ecore</foreignModel>
   <genPackages prefix="Id" basePackage="org.eclipse.rmf.pror.reqif10.presentation"
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/notice.html b/org.eclipse.rmf.reqif10.pror.presentation.id/notice.html
index 5ef68115..5ef68115 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/notice.html
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/plugin.properties b/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.properties
index 120a1477..120a1477 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.properties
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/plugin.xml b/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.xml
index 1941e642..2f36353c 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/plugin.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/plugin.xml
@@ -21,7 +21,7 @@ Contributors:
    <extension point="org.eclipse.emf.edit.itemProviderAdapterFactories">
       <factory
             uri="http://pror.org/presentation/id"
-            class="org.eclipse.rmf.pror.reqif10.presentation.id.provider.IdItemProviderAdapterFactory"
+            class="org.eclipse.rmf.reqif10.pror.presentation.id.provider.IdItemProviderAdapterFactory"
             supportedTypes=
               "org.eclipse.emf.edit.provider.IEditingDomainItemProvider
                org.eclipse.emf.edit.provider.IStructuredItemContentProvider
@@ -33,13 +33,13 @@ Contributors:
    <extension point="org.eclipse.emf.ecore.generated_package">
       <package
             uri="http://pror.org/presentation/id"
-            class="org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage"
+            class="org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage"
             genModel="model/ID.genmodel"/>
    </extension>
    <extension
          point="org.eclipse.rmf.reqif10.pror.editor.presentation">
       <presentation
-            service="org.eclipse.rmf.pror.reqif10.presentation.ui.IdPresentationService"
+            service="org.eclipse.rmf.reqif10.pror.presentation.ui.IdPresentationService"
             name="ID Generator">
       </presentation>
    </extension>
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/pom.xml b/org.eclipse.rmf.reqif10.pror.presentation.id/pom.xml
index f040f3a2..9f5cddd4 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/pom.xml
@@ -9,7 +9,7 @@
 		<version>0.4.0-SNAPSHOT</version>
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
-	<artifactId>org.eclipse.rmf.pror.reqif10.presentation.id</artifactId>
+	<artifactId>org.eclipse.rmf.reqif10.pror.presentation.id</artifactId>
 	<version>0.4.0-SNAPSHOT</version>
 	<packaging>eclipse-plugin</packaging>
 	<groupId>org.eclipse.rmf.plugins</groupId>
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdConfiguration.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdConfiguration.java
index ed7855e7..f8715487 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdConfiguration.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdConfiguration.java
@@ -10,7 +10,7 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id;
+package org.eclipse.rmf.reqif10.pror.presentation.id;
 
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 
@@ -23,13 +23,13 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
  * <p>
  * The following features are supported:
  * <ul>
- *   <li>{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getCount <em>Count</em>}</li>
- *   <li>{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getVerticalAlign <em>Vertical Align</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getPrefix <em>Prefix</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getCount <em>Count</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getVerticalAlign <em>Vertical Align</em>}</li>
  * </ul>
  * </p>
  *
- * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage#getIdConfiguration()
+ * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage#getIdConfiguration()
  * @model
  * @generated
  */
@@ -45,14 +45,14 @@ public interface IdConfiguration extends ProrPresentationConfiguration {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Prefix</em>' attribute.
 	 * @see #setPrefix(String)
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage#getIdConfiguration_Prefix()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage#getIdConfiguration_Prefix()
 	 * @model default="REQ-" required="true"
 	 * @generated
 	 */
 	String getPrefix();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getPrefix <em>Prefix</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getPrefix <em>Prefix</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Prefix</em>' attribute.
@@ -71,14 +71,14 @@ public interface IdConfiguration extends ProrPresentationConfiguration {
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Count</em>' attribute.
 	 * @see #setCount(int)
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage#getIdConfiguration_Count()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage#getIdConfiguration_Count()
 	 * @model required="true"
 	 * @generated
 	 */
 	int getCount();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getCount <em>Count</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getCount <em>Count</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Count</em>' attribute.
@@ -90,7 +90,7 @@ public interface IdConfiguration extends ProrPresentationConfiguration {
 	/**
 	 * Returns the value of the '<em><b>Vertical Align</b></em>' attribute.
 	 * The default value is <code>"Top"</code>.
-	 * The literals are from the enumeration {@link org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign}.
+	 * The literals are from the enumeration {@link org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign}.
 	 * <!-- begin-user-doc -->
 	 * <p>
 	 * If the meaning of the '<em>Vertical Align</em>' attribute isn't clear,
@@ -98,20 +98,20 @@ public interface IdConfiguration extends ProrPresentationConfiguration {
 	 * </p>
 	 * <!-- end-user-doc -->
 	 * @return the value of the '<em>Vertical Align</em>' attribute.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign
 	 * @see #setVerticalAlign(IdVerticalAlign)
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage#getIdConfiguration_VerticalAlign()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage#getIdConfiguration_VerticalAlign()
 	 * @model default="Top"
 	 * @generated
 	 */
 	IdVerticalAlign getVerticalAlign();
 
 	/**
-	 * Sets the value of the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getVerticalAlign <em>Vertical Align</em>}' attribute.
+	 * Sets the value of the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getVerticalAlign <em>Vertical Align</em>}' attribute.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @param value the new value of the '<em>Vertical Align</em>' attribute.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign
 	 * @see #getVerticalAlign()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdFactory.java
index 4301fee3..5e96fa71 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdFactory.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id;
+package org.eclipse.rmf.reqif10.pror.presentation.id;
 
 import org.eclipse.emf.ecore.EFactory;
 
@@ -18,7 +18,7 @@ import org.eclipse.emf.ecore.EFactory;
  * The <b>Factory</b> for the model.
  * It provides a create method for each non-abstract class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage
+ * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage
  * @generated
  */
 public interface IdFactory extends EFactory {
@@ -28,7 +28,7 @@ public interface IdFactory extends EFactory {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	IdFactory eINSTANCE = org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdFactoryImpl.init();
+	IdFactory eINSTANCE = org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdFactoryImpl.init();
 
 	/**
 	 * Returns a new object of class '<em>Configuration</em>'.
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdPackage.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdPackage.java
index 67bcfa51..8707cfb6 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdPackage.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdPackage.java
@@ -10,7 +10,7 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id;
+package org.eclipse.rmf.reqif10.pror.presentation.id;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
@@ -29,7 +29,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
  *   <li>and each data type</li>
  * </ul>
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdFactory
+ * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory
  * @model kind="package"
  * @generated
  */
@@ -64,14 +64,14 @@ public interface IdPackage extends EPackage {
 	 * <!-- end-user-doc -->
 	 * @generated
 	 */
-	IdPackage eINSTANCE = org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdPackageImpl.init();
+	IdPackage eINSTANCE = org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdPackageImpl.init();
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl <em>Configuration</em>}' class.
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl <em>Configuration</em>}' class.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdPackageImpl#getIdConfiguration()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdPackageImpl#getIdConfiguration()
 	 * @generated
 	 */
 	int ID_CONFIGURATION = 0;
@@ -123,65 +123,65 @@ public interface IdPackage extends EPackage {
 
 
 	/**
-	 * The meta object id for the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign <em>Vertical Align</em>}' enum.
+	 * The meta object id for the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign <em>Vertical Align</em>}' enum.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdPackageImpl#getIdVerticalAlign()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdPackageImpl#getIdVerticalAlign()
 	 * @generated
 	 */
 	int ID_VERTICAL_ALIGN = 1;
 
 
 	/**
-	 * Returns the meta object for class '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration <em>Configuration</em>}'.
+	 * Returns the meta object for class '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for class '<em>Configuration</em>'.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration
 	 * @generated
 	 */
 	EClass getIdConfiguration();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getPrefix <em>Prefix</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getPrefix <em>Prefix</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Prefix</em>'.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getPrefix()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getPrefix()
 	 * @see #getIdConfiguration()
 	 * @generated
 	 */
 	EAttribute getIdConfiguration_Prefix();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getCount <em>Count</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getCount <em>Count</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Count</em>'.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getCount()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getCount()
 	 * @see #getIdConfiguration()
 	 * @generated
 	 */
 	EAttribute getIdConfiguration_Count();
 
 	/**
-	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getVerticalAlign <em>Vertical Align</em>}'.
+	 * Returns the meta object for the attribute '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getVerticalAlign <em>Vertical Align</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for the attribute '<em>Vertical Align</em>'.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration#getVerticalAlign()
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration#getVerticalAlign()
 	 * @see #getIdConfiguration()
 	 * @generated
 	 */
 	EAttribute getIdConfiguration_VerticalAlign();
 
 	/**
-	 * Returns the meta object for enum '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign <em>Vertical Align</em>}'.
+	 * Returns the meta object for enum '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign <em>Vertical Align</em>}'.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @return the meta object for enum '<em>Vertical Align</em>'.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign
 	 * @generated
 	 */
 	EEnum getIdVerticalAlign();
@@ -209,11 +209,11 @@ public interface IdPackage extends EPackage {
 	 */
 	interface Literals {
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl <em>Configuration</em>}' class.
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl <em>Configuration</em>}' class.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl
-		 * @see org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdPackageImpl#getIdConfiguration()
+		 * @see org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl
+		 * @see org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdPackageImpl#getIdConfiguration()
 		 * @generated
 		 */
 		EClass ID_CONFIGURATION = eINSTANCE.getIdConfiguration();
@@ -243,11 +243,11 @@ public interface IdPackage extends EPackage {
 		EAttribute ID_CONFIGURATION__VERTICAL_ALIGN = eINSTANCE.getIdConfiguration_VerticalAlign();
 
 		/**
-		 * The meta object literal for the '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign <em>Vertical Align</em>}' enum.
+		 * The meta object literal for the '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign <em>Vertical Align</em>}' enum.
 		 * <!-- begin-user-doc -->
 		 * <!-- end-user-doc -->
-		 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign
-		 * @see org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdPackageImpl#getIdVerticalAlign()
+		 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign
+		 * @see org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdPackageImpl#getIdVerticalAlign()
 		 * @generated
 		 */
 		EEnum ID_VERTICAL_ALIGN = eINSTANCE.getIdVerticalAlign();
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdVerticalAlign.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdVerticalAlign.java
index 04260134..f0426659 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/IdVerticalAlign.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/IdVerticalAlign.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Kay Münch - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.presentation.id;
+package org.eclipse.rmf.reqif10.pror.presentation.id;
 
 import java.util.Arrays;
 import java.util.Collections;
@@ -21,7 +21,7 @@ import org.eclipse.emf.common.util.Enumerator;
  * A representation of the literals of the enumeration '<em><b>Vertical Align</b></em>',
  * and utility methods for working with them.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage#getIdVerticalAlign()
+ * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage#getIdVerticalAlign()
  * @model
  * @generated
  */
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/impl/IdConfigurationImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdConfigurationImpl.java
index c73e69ac..b4cdf7b2 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/impl/IdConfigurationImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdConfigurationImpl.java
@@ -10,20 +10,20 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.impl;
+package org.eclipse.rmf.reqif10.pror.presentation.id.impl;
 
 import org.eclipse.emf.common.notify.Notification;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.impl.ENotificationImpl;
 import org.eclipse.emf.ecore.util.EContentAdapter;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign;
 import org.eclipse.rmf.reqif10.AttributeValueString;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;
 import org.eclipse.rmf.reqif10.pror.configuration.impl.ProrPresentationConfigurationImpl;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign;
 
 /**
  * <!-- begin-user-doc -->
@@ -32,9 +32,9 @@ import org.eclipse.rmf.reqif10.pror.configuration.impl.ProrPresentationConfigura
  * <p>
  * The following features are implemented:
  * <ul>
- *   <li>{@link org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl#getPrefix <em>Prefix</em>}</li>
- *   <li>{@link org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl#getCount <em>Count</em>}</li>
- *   <li>{@link org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl#getVerticalAlign <em>Vertical Align</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl#getPrefix <em>Prefix</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl#getCount <em>Count</em>}</li>
+ *   <li>{@link org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl#getVerticalAlign <em>Vertical Align</em>}</li>
  * </ul>
  * </p>
  *
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/impl/IdFactoryImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdFactoryImpl.java
index f4c1965d..fd010938 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/impl/IdFactoryImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdFactoryImpl.java
@@ -10,7 +10,7 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.impl;
+package org.eclipse.rmf.reqif10.pror.presentation.id.impl;
 
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EDataType;
@@ -18,10 +18,7 @@ import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EFactoryImpl;
 import org.eclipse.emf.ecore.plugin.EcorePlugin;
-import org.eclipse.rmf.pror.reqif10.presentation.id.*;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdFactory;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage;
+import org.eclipse.rmf.reqif10.pror.presentation.id.*;
 
 
 /**
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/impl/IdPackageImpl.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdPackageImpl.java
index d5dfe641..28fccbc3 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/impl/IdPackageImpl.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/impl/IdPackageImpl.java
@@ -9,20 +9,20 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.impl;
+package org.eclipse.rmf.reqif10.pror.presentation.id.impl;
 
 import org.eclipse.emf.ecore.EAttribute;
 import org.eclipse.emf.ecore.EClass;
 import org.eclipse.emf.ecore.EEnum;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.impl.EPackageImpl;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdFactory;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 
 /**
@@ -57,7 +57,7 @@ public class IdPackageImpl extends EPackageImpl implements IdPackage {
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @see org.eclipse.emf.ecore.EPackage.Registry
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage#eNS_URI
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage#eNS_URI
 	 * @see #init()
 	 * @generated
 	 */
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/provider/IDEditPlugin.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IDEditPlugin.java
index 6c12d99e..972aa169 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/provider/IDEditPlugin.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IDEditPlugin.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.provider;
+package org.eclipse.rmf.reqif10.pror.presentation.id.provider;
 
 import org.eclipse.emf.common.EMFPlugin;
 import org.eclipse.emf.common.util.ResourceLocator;
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/provider/IdConfigurationItemProvider.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdConfigurationItemProvider.java
index 3a1c74b5..c016ccd6 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/provider/IdConfigurationItemProvider.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdConfigurationItemProvider.java
@@ -10,7 +10,7 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.provider;
+package org.eclipse.rmf.reqif10.pror.presentation.id.provider;
 
 
 import java.util.Collection;
@@ -35,8 +35,6 @@ import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
 import org.eclipse.emf.edit.provider.ItemPropertyDescriptor;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage;
 import org.eclipse.rmf.reqif10.AttributeValue;
 import org.eclipse.rmf.reqif10.AttributeValueString;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
@@ -44,9 +42,11 @@ import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.provider.ProrPresentationConfigurationItemProvider;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage;
 
 /**
- * This is the item provider adapter for a {@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration} object.
+ * This is the item provider adapter for a {@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration} object.
  * <!-- begin-user-doc -->
  * <!-- end-user-doc -->
  * @generated
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/provider/IdItemProviderAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdItemProviderAdapterFactory.java
index 165e7931..e2d3bdf9 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/provider/IdItemProviderAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/provider/IdItemProviderAdapterFactory.java
@@ -9,7 +9,7 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.provider;
+package org.eclipse.rmf.reqif10.pror.presentation.id.provider;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -30,7 +30,7 @@ import org.eclipse.emf.edit.provider.IItemPropertySource;
 import org.eclipse.emf.edit.provider.INotifyChangedListener;
 import org.eclipse.emf.edit.provider.IStructuredItemContentProvider;
 import org.eclipse.emf.edit.provider.ITreeItemContentProvider;
-import org.eclipse.rmf.pror.reqif10.presentation.id.util.IdAdapterFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.id.util.IdAdapterFactory;
 
 
 /**
@@ -90,7 +90,7 @@ public class IdItemProviderAdapterFactory extends IdAdapterFactory implements Co
 	}
 
 	/**
-	 * This creates an adapter for a {@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration}.
+	 * This creates an adapter for a {@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration}.
 	 * <!-- begin-user-doc -->
 	 * <!-- end-user-doc -->
 	 * @generated
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/util/IdAdapterFactory.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdAdapterFactory.java
index 8cd2316b..fdd47158 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/util/IdAdapterFactory.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdAdapterFactory.java
@@ -10,22 +10,22 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.util;
+package org.eclipse.rmf.reqif10.pror.presentation.id.util;
 
 import org.eclipse.emf.common.notify.Adapter;
 import org.eclipse.emf.common.notify.Notifier;
 import org.eclipse.emf.common.notify.impl.AdapterFactoryImpl;
 import org.eclipse.emf.ecore.EObject;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage;
 
 /**
  * <!-- begin-user-doc -->
  * The <b>Adapter Factory</b> for the model.
  * It provides an adapter <code>createXXX</code> method for each class of the model.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage
+ * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage
  * @generated
  */
 public class IdAdapterFactory extends AdapterFactoryImpl {
@@ -105,13 +105,13 @@ public class IdAdapterFactory extends AdapterFactoryImpl {
 
 
 	/**
-	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration <em>Configuration</em>}'.
+	 * Creates a new adapter for an object of class '{@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration <em>Configuration</em>}'.
 	 * <!-- begin-user-doc -->
 	 * This default implementation returns null so that we can easily ignore cases;
 	 * it's useful to ignore a case when inheritance will catch all the cases anyway.
 	 * <!-- end-user-doc -->
 	 * @return the new adapter.
-	 * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration
+	 * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration
 	 * @generated
 	 */
 	public Adapter createIdConfigurationAdapter() {
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/util/IdSwitch.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdSwitch.java
index 0d77488a..08808a33 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/util/IdSwitch.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/util/IdSwitch.java
@@ -10,14 +10,14 @@
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.util;
+package org.eclipse.rmf.reqif10.pror.presentation.id.util;
 
 import org.eclipse.emf.ecore.EObject;
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.util.Switch;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage;
 
 /**
  * <!-- begin-user-doc -->
@@ -29,7 +29,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
  * until a non-null result is returned,
  * which is the result of the switch.
  * <!-- end-user-doc -->
- * @see org.eclipse.rmf.pror.reqif10.presentation.id.IdPackage
+ * @see org.eclipse.rmf.reqif10.pror.presentation.id.IdPackage
  * @generated
  */
 public class IdSwitch<T> extends Switch<T> {
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/validation/IdConfigurationValidator.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/validation/IdConfigurationValidator.java
index 293d65d1..56725cd0 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/id/validation/IdConfigurationValidator.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/id/validation/IdConfigurationValidator.java
@@ -9,11 +9,11 @@
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
 
-package org.eclipse.rmf.pror.reqif10.presentation.id.validation;
+package org.eclipse.rmf.reqif10.pror.presentation.id.validation;
 
 
 /**
- * A sample validator interface for {@link org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration}.
+ * A sample validator interface for {@link org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration}.
  * This doesn't really do anything, and it's not a real EMF artifact.
  * It was generated by the org.eclipse.emf.examples.generator.validator plug-in to illustrate how EMF's code generator can be extended.
  * This can be disabled with -vmargs -Dorg.eclipse.emf.examples.generator.validator=false.
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/ui/IdLabelCellRenderer.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/ui/IdLabelCellRenderer.java
index 36f85838..0f66e49f 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/ui/IdLabelCellRenderer.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/ui/IdLabelCellRenderer.java
@@ -9,10 +9,8 @@
  *     Michael Jastram - initial API and implementation
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.presentation.ui;
+package org.eclipse.rmf.reqif10.pror.presentation.ui;
 
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdVerticalAlign;
 import org.eclipse.rmf.pror.reqif10.util.ConfigurationUtil;
 import org.eclipse.rmf.reqif10.AttributeDefinitionString;
 import org.eclipse.rmf.reqif10.AttributeValue;
@@ -21,6 +19,8 @@ import org.eclipse.rmf.reqif10.DatatypeDefinitionString;
 import org.eclipse.rmf.reqif10.common.util.ReqIF10Util;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.IProrCellRenderer;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdVerticalAlign;
 import org.eclipse.swt.graphics.GC;
 import org.eclipse.swt.graphics.Point;
 import org.eclipse.swt.graphics.Rectangle;
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/ui/IdPresentationService.java b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/ui/IdPresentationService.java
index d815f912..db79d3a5 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/src/org/eclipse/rmf/pror/reqif10/presentation/ui/IdPresentationService.java
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/src/org/eclipse/rmf/reqif10/pror/presentation/ui/IdPresentationService.java
@@ -9,13 +9,13 @@
  *     Michael Jastram - initial API and implementation
  *     Kay Münch       - vertical alignment of the spec objects id
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.presentation.ui;
+package org.eclipse.rmf.reqif10.pror.presentation.ui;
 
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdFactory;
-import org.eclipse.rmf.pror.reqif10.presentation.id.impl.IdConfigurationImpl;
 import org.eclipse.rmf.reqif10.AttributeValueString;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.editor.presentation.service.AbstractPresentationService;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.id.impl.IdConfigurationImpl;
 
 /**
  * A presentation to automatically assign human-readable IDs of the form
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.id/text/description.txt b/org.eclipse.rmf.reqif10.pror.presentation.id/text/description.txt
index d0981812..d0981812 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.id/text/description.txt
+++ b/org.eclipse.rmf.reqif10.pror.presentation.id/text/description.txt
diff --git a/org.eclipse.rmf.pror.reqif10.tests/.classpath b/org.eclipse.rmf.reqif10.pror.tests/.classpath
index 258e2db1..0e3774e5 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/.classpath
+++ b/org.eclipse.rmf.reqif10.pror.tests/.classpath
@@ -2,7 +2,7 @@
 <classpath>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
-	<classpathentry kind="src" path="tests"/>
+	<classpathentry kind="src" path="src"/>
 	<classpathentry kind="lib" path="lib/mockito-all-1.8.4.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/org.eclipse.rmf.pror.reqif10.tests/.gitignore b/org.eclipse.rmf.reqif10.pror.tests/.gitignore
index c6048b6a..c6048b6a 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/.gitignore
+++ b/org.eclipse.rmf.reqif10.pror.tests/.gitignore
diff --git a/org.eclipse.rmf.pror.reqif10.presentation.headline/.project b/org.eclipse.rmf.reqif10.pror.tests/.project
index 78984194..6ca37caf 100644
--- a/org.eclipse.rmf.pror.reqif10.presentation.headline/.project
+++ b/org.eclipse.rmf.reqif10.pror.tests/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>org.eclipse.rmf.pror.reqif10.presentation.headline</name>
+	<name>org.eclipse.rmf.reqif10.pror.tests</name>
 	<comment></comment>
 	<projects>
 	</projects>
@@ -22,7 +22,7 @@
 		</buildCommand>
 	</buildSpec>
 	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
 		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
 	</natures>
 </projectDescription>
diff --git a/org.eclipse.rmf.pror.reqif10.tests/.settings/org.eclipse.jdt.core.prefs b/org.eclipse.rmf.reqif10.pror.tests/.settings/org.eclipse.jdt.core.prefs
index 1e172f43..1e172f43 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/.settings/org.eclipse.jdt.core.prefs
+++ b/org.eclipse.rmf.reqif10.pror.tests/.settings/org.eclipse.jdt.core.prefs
diff --git a/org.eclipse.rmf.pror.reqif10.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.pror.tests/META-INF/MANIFEST.MF
index 41f66120..383f722d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.pror.tests/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
-Bundle-SymbolicName: org.eclipse.rmf.pror.reqif10.tests;singleton:=true
+Bundle-SymbolicName: org.eclipse.rmf.reqif10.pror.tests;singleton:=true
 Bundle-Version: 0.4.0.qualifier
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -11,13 +11,13 @@ Require-Bundle: org.junit,
  org.eclipse.core.runtime,
  org.eclipse.rmf.serialization;bundle-version="0.4.0",
  org.eclipse.rmf.reqif10.pror.editor;bundle-version="0.4.0",
- org.eclipse.rmf.pror.reqif10.presentation.headline;bundle-version="0.4.0",
- org.eclipse.rmf.pror.reqif10.presentation.id;bundle-version="0.4.0",
+ org.eclipse.rmf.reqif10.pror.presentation.headline;bundle-version="0.4.0",
+ org.eclipse.rmf.reqif10.pror.presentation.id;bundle-version="0.4.0",
  org.eclipse.rmf.pror.reqif10.presentation.linewrap;bundle-version="0.4.0"
 Bundle-Vendor: %providerName
-Export-Package: org.eclipse.rmf.pror.reqif10.testdata,
- org.eclipse.rmf.pror.reqif10.testframework,
- org.eclipse.rmf.pror.reqif10.tests.util,
- org.eclipse.rmf.reqif10.configuration.tests
+Export-Package: org.eclipse.rmf.reqif10.configuration.tests,
+ org.eclipse.rmf.reqif10.pror.testdata,
+ org.eclipse.rmf.reqif10.pror.testframework,
+ org.eclipse.rmf.reqif10.pror.tests.util
 Bundle-ClassPath: lib/mockito-all-1.8.4.jar,
  .
diff --git a/org.eclipse.rmf.pror.reqif10.tests/about.html b/org.eclipse.rmf.reqif10.pror.tests/about.html
index f47dbddb..f47dbddb 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/about.html
+++ b/org.eclipse.rmf.reqif10.pror.tests/about.html
diff --git a/org.eclipse.rmf.pror.reqif10.tests/build.properties b/org.eclipse.rmf.reqif10.pror.tests/build.properties
index 0f34e367..0bff3bd0 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/build.properties
+++ b/org.eclipse.rmf.reqif10.pror.tests/build.properties
@@ -6,7 +6,7 @@
 #
 # Contributors:
 #     Michael Jastram - initial API and implementation
-source.. = tests/
+source.. = src/
 output.. = bin/
 bin.includes = META-INF/,\
                .,\
diff --git a/org.eclipse.rmf.pror.reqif10.tests/epl-v10.html b/org.eclipse.rmf.reqif10.pror.tests/epl-v10.html
index 813c07d8..813c07d8 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/epl-v10.html
+++ b/org.eclipse.rmf.reqif10.pror.tests/epl-v10.html
diff --git a/org.eclipse.rmf.pror.reqif10.tests/lib/mockito-all-1.8.4.jar b/org.eclipse.rmf.reqif10.pror.tests/lib/mockito-all-1.8.4.jar
index 5986ea6a..5986ea6a 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/lib/mockito-all-1.8.4.jar
+++ b/org.eclipse.rmf.reqif10.pror.tests/lib/mockito-all-1.8.4.jar
diff --git a/org.eclipse.rmf.pror.reqif10.tests/notice.html b/org.eclipse.rmf.reqif10.pror.tests/notice.html
index 5ef68115..5ef68115 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/notice.html
+++ b/org.eclipse.rmf.reqif10.pror.tests/notice.html
diff --git a/org.eclipse.rmf.pror.reqif10.tests/plugin.properties b/org.eclipse.rmf.reqif10.pror.tests/plugin.properties
index 1c0a6dbf..1c0a6dbf 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/plugin.properties
+++ b/org.eclipse.rmf.reqif10.pror.tests/plugin.properties
diff --git a/org.eclipse.rmf.pror.reqif10.tests/pom.xml b/org.eclipse.rmf.reqif10.pror.tests/pom.xml
index 00696985..b6ba1234 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/pom.xml
+++ b/org.eclipse.rmf.reqif10.pror.tests/pom.xml
@@ -10,7 +10,7 @@
 		<relativePath>../org.eclipse.rmf.releng/pom.xml</relativePath>
 	</parent>
 	<groupId>org.eclipse.rmf.plugins</groupId>
-	<artifactId>org.eclipse.rmf.pror.reqif10.tests</artifactId>
+	<artifactId>org.eclipse.rmf.reqif10.pror.tests</artifactId>
 	<version>0.4.0-SNAPSHOT</version>
 	<packaging>eclipse-test-plugin</packaging>
 	<profiles>
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java
index 930af84b..930af84b 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/AllConfigurationTests.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java
index cf81cfd7..7c1fe986 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ColumnTest.java
@@ -16,11 +16,11 @@ import static org.junit.Assert.assertTrue;
 
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ViewerNotification;
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.configuration.Column;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrSpecViewConfiguration;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java
index 89430b2d..4a20a766 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ConfigurationUtilTest.java
@@ -15,13 +15,13 @@ import static org.mockito.Mockito.*;
 
 import org.eclipse.emf.ecore.util.FeatureMap;
 import org.eclipse.emf.ecore.util.FeatureMap.ValueListIterator;
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.pror.reqif10.util.ConfigurationUtil;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.ReqIFToolExtension;
 import org.eclipse.rmf.reqif10.impl.ReqIFToolExtensionImpl;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.Test;
 
 public class ConfigurationUtilTest extends AbstractItemProviderTest {
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java
index 984fc91c..3dcd966d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/LabelConfigurationTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.configuration.tests;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.LabelConfiguration;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java
index 9ddc5c97..1cc6208c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrGeneralConfigurationTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.configuration.tests;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java
index de255715..d80bc58a 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationTest.java
@@ -13,13 +13,13 @@ package org.eclipse.rmf.reqif10.configuration.tests;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.DatatypeDefinition;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.Test;
 
 /**
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java
index 3fb8ddff..3046ec9d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrPresentationConfigurationsTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.configuration.tests;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
index 5f3eb974..7d79e599 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrSpecViewConfigurationTest.java
@@ -13,11 +13,11 @@ package org.eclipse.rmf.reqif10.configuration.tests;
 
 import static org.junit.Assert.assertEquals;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.configuration.Column;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrSpecViewConfiguration;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java
index 099f2387..445841d4 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/configuration/tests/ProrToolExtensionTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.configuration.tests;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationFactory;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/editor/presentation/service/PresentationServiceManagerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManagerTest.java
index f7661446..49e2dbe9 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/editor/presentation/service/PresentationServiceManagerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/PresentationServiceManagerTest.java
@@ -1,20 +1,19 @@
-package org.eclipse.rmf.pror.reqif10.editor.presentation.service;
+package org.eclipse.rmf.reqif10.pror.editor.presentation.service;
 
 import java.util.Map;
 
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineFactory;
-import org.eclipse.rmf.pror.presentation.headline.ui.HeadlinePresentationService;
 import org.eclipse.rmf.pror.presentation.linewrap.LinewrapConfiguration;
 import org.eclipse.rmf.pror.presentation.linewrap.LinewrapFactory;
 import org.eclipse.rmf.pror.presentation.ui.LinewrapPresentationService;
 import org.eclipse.rmf.pror.reqif10.edit.presentation.service.PresentationInterface;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdConfiguration;
-import org.eclipse.rmf.pror.reqif10.presentation.id.IdFactory;
-import org.eclipse.rmf.pror.reqif10.presentation.ui.IdPresentationService;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.impl.ProrPresentationConfigurationImpl;
-import org.eclipse.rmf.reqif10.pror.editor.presentation.service.PresentationServiceManager;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.ui.HeadlinePresentationService;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.id.IdFactory;
+import org.eclipse.rmf.reqif10.pror.presentation.ui.IdPresentationService;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/editor/presentation/service/README.txt b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/README.txt
index dbd0b1c9..dbd0b1c9 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/editor/presentation/service/README.txt
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/editor/presentation/service/README.txt
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testdata/TestData.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/TestData.java
index 0c833352..dea7f6fa 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testdata/TestData.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/TestData.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.testdata;
+package org.eclipse.rmf.reqif10.pror.testdata;
 
 import java.net.URISyntaxException;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testdata/bare.reqif b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/bare.reqif
index 0395d689..0395d689 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testdata/bare.reqif
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/bare.reqif
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testdata/simple.reqif b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/simple.reqif
index 74aed693..74aed693 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testdata/simple.reqif
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testdata/simple.reqif
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testframework/AbstractItemProviderTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/AbstractItemProviderTest.java
index 873ae926..87139de9 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testframework/AbstractItemProviderTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/AbstractItemProviderTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.testframework;
+package org.eclipse.rmf.reqif10.pror.testframework;
 
 import java.net.URISyntaxException;
 import java.util.ArrayList;
@@ -36,10 +36,10 @@ import org.eclipse.emf.edit.provider.ItemProviderAdapter;
 import org.eclipse.emf.edit.provider.ReflectiveItemProviderAdapterFactory;
 import org.eclipse.emf.edit.provider.resource.ResourceItemProviderAdapterFactory;
 import org.eclipse.rmf.pror.reqif10.provider.ReqIF10ItemProviderAdapterFactory;
-import org.eclipse.rmf.pror.reqif10.testdata.TestData;
 import org.eclipse.rmf.pror.reqif10.xhtml.provider.XhtmlItemProviderAdapterFactory;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.pror.configuration.util.ConfigurationAdapterFactory;
+import org.eclipse.rmf.reqif10.pror.testdata.TestData;
 import org.eclipse.rmf.serialization.ReqIFResourceFactoryImpl;
 import org.eclipse.rmf.serialization.ReqIFResourceSetImpl;
 import org.junit.After;
@@ -138,7 +138,7 @@ abstract public class AbstractItemProviderTest {
 	}
 
 	/**
-	 * Builds a ReqIF model from a file that is stored in org.eclipse.rmf.pror.reqif10.testdata.
+	 * Builds a ReqIF model from a file that is stored in org.eclipse.rmf.reqif10.pror.testdata.
 	 * 
 	 * @param filename
 	 *            without path
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testframework/Filter.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/Filter.java
index b5cd3c78..afe8fcc5 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/testframework/Filter.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/testframework/Filter.java
@@ -11,7 +11,7 @@
 /**
  * 
  */
-package org.eclipse.rmf.pror.reqif10.testframework;
+package org.eclipse.rmf.reqif10.pror.testframework;
 
 import org.eclipse.emf.common.notify.Notification;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/tests/util/ReqIfResourceUtils.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ReqIfResourceUtils.java
index 51618495..7a047aaa 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/tests/util/ReqIfResourceUtils.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ReqIfResourceUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.tests.util;
+package org.eclipse.rmf.reqif10.pror.tests.util;
 
 import java.io.ByteArrayInputStream;
 import java.io.InputStream;
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/tests/util/ResourceUtils.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ResourceUtils.java
index 2a67b561..ec2babc2 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/tests/util/ResourceUtils.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/tests/util/ResourceUtils.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.tests.util;
+package org.eclipse.rmf.reqif10.pror.tests.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/util/AllUtilTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/AllUtilTests.java
index daf8c5a7..df3acb0c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/util/AllUtilTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/AllUtilTests.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Lukas Ladenberger - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.util;
+package org.eclipse.rmf.reqif10.pror.util;
 
 import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/util/ConfigurationUtilTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtilTest.java
index 569f36f7..894fabbf 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/util/ConfigurationUtilTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ConfigurationUtilTest.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.util;
+package org.eclipse.rmf.reqif10.pror.util;
 
 import static org.junit.Assert.*;
 
@@ -17,7 +17,7 @@ import java.util.List;
 
 import org.eclipse.emf.ecore.EPackage;
 import org.eclipse.emf.ecore.EcoreFactory;
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
+import org.eclipse.rmf.pror.reqif10.util.ConfigurationUtil;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
@@ -29,6 +29,7 @@ import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.Test;
 
 public class ConfigurationUtilTest extends AbstractItemProviderTest {
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/util/ReadAndWriteReqIF.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ReadAndWriteReqIF.java
index c1bc24ab..ca6b3f9b 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/pror/reqif10/util/ReadAndWriteReqIF.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/pror/util/ReadAndWriteReqIF.java
@@ -8,7 +8,7 @@
  * Contributors:
  *     Michael Jastram - initial API and implementation
  ******************************************************************************/
-package org.eclipse.rmf.pror.reqif10.util;
+package org.eclipse.rmf.reqif10.pror.util;
 
 import static org.junit.Assert.assertEquals;
 
@@ -19,11 +19,11 @@ import java.util.HashMap;
 
 import org.eclipse.emf.common.util.URI;
 import org.eclipse.emf.ecore.resource.Resource;
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.SpecHierarchy;
 import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.Test;
 
 /**
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java
index 0a795daf..0a795daf 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AccessControlledElementTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java
index 2cab83b5..2cab83b5 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeDefinitionTests.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java
index fad9582d..fad9582d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderAttributeValueTests.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java
index fe601871..fe601871 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderDatatypeDefinitionTests.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java
index 375eddb5..375eddb5 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AllItemProviderTests.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java
index 9e6b520e..bea24e6a 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AlternativeIdTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.provider;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.AlternativeID;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 
 /**
  * A test case for the model object '<em><b>Alternative Id</b></em>'.
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java
index e9256770..e9256770 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionBooleanTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java
index 61554312..61554312 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionDateTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java
index a525141c..a525141c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionEnumerationTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java
index e8cb29bb..e8cb29bb 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionIntegerTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java
index c5fb6fce..c5fb6fce 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionRealTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java
index 4ff8c14f..4ff8c14f 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionSimpleTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java
index 6335949a..6335949a 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionStringTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java
index db8a3b0b..db8a3b0b 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java
index b50acdce..b50acdce 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeDefinitionXhtmlTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java
index a4f97303..a4f97303 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueBooleanTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java
index e82f63a7..e82f63a7 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueDateTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java
index e184f5d1..e184f5d1 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueEnumerationTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java
index 4ad29ba0..4ad29ba0 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueIntegerTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java
index 0590f036..0590f036 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueRealTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java
index b9c8ef0d..b9c8ef0d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueSimpleTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java
index 71880e6c..71880e6c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueStringTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java
index 6806daf6..38b3d1ff 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueTest.java
@@ -14,11 +14,11 @@ import static org.junit.Assert.assertEquals;
 
 import java.net.URISyntaxException;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.pror.reqif10.util.ProrUtil;
 import org.eclipse.rmf.reqif10.AttributeValue;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.SpecObject;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.Test;
 
 /**
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java
index 05136c59..05136c59 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/AttributeValueXhtmlTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java
index 745f74ae..745f74ae 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionBooleanTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java
index f6e8b44d..f6e8b44d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionDateTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java
index b23b7bca..b23b7bca 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionEnumerationTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java
index 19afc82c..19afc82c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionIntegerTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java
index d1ef8c69..d1ef8c69 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionRealTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java
index 929b0c7c..929b0c7c 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionSimpleTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java
index 1ec34e70..1ec34e70 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionStringTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java
index c17709a2..c17709a2 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java
index 7d262b12..7d262b12 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/DatatypeDefinitionXhtmlTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java
index db8776e9..944aecb2 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EmbeddedValueTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.provider;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.EmbeddedValue;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/EnumValueTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EnumValueTest.java
index 06473d33..06473d33 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/EnumValueTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/EnumValueTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java
index 37c35794..a41fa3ca 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/IdentifiableTest.java
@@ -15,9 +15,9 @@ import javax.xml.datatype.DatatypeConfigurationException;
 import javax.xml.datatype.DatatypeFactory;
 
 import org.eclipse.emf.edit.provider.ItemProviderAdapter;
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.pror.reqif10.util.ProrUtil;
 import org.eclipse.rmf.reqif10.Identifiable;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.Assert;
 import org.junit.Test;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java
index 88148459..88148459 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java
index 24cf2e7a..24cf2e7a 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/RelationGroupTypeTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java
index 16f26dac..d807f0bc 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfContentTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.provider;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.ReqIFContent;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java
index d2675459..b7b1d31d 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfHeaderTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.provider;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
 import org.eclipse.rmf.reqif10.ReqIFHeader;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/ReqIfTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfTest.java
index 1788f01d..563754f0 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/ReqIfTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/ReqIfTest.java
@@ -11,9 +11,9 @@
 
 package org.eclipse.rmf.reqif10.provider;
 
-import org.eclipse.rmf.pror.reqif10.testframework.AbstractItemProviderTest;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Factory;
+import org.eclipse.rmf.reqif10.pror.testframework.AbstractItemProviderTest;
 import org.junit.After;
 import org.junit.Before;
 
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java
index bdd76425..bdd76425 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecElementWithAttributesTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java
index d55308b8..d55308b8 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecHierarchyTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java
index 4024b463..4024b463 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java
index 0ead6035..0ead6035 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecObjectTypeTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java
index fe7ace29..fe7ace29 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java
index 299967de..299967de 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecRelationTypeTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java
index 59683294..59683294 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecTypeTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecificationTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTest.java
index 8fbb48d3..8fbb48d3 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecificationTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTest.java
diff --git a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java
index 42be36b5..42be36b5 100644
--- a/org.eclipse.rmf.pror.reqif10.tests/tests/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java
+++ b/org.eclipse.rmf.reqif10.pror.tests/src/org/eclipse/rmf/reqif10/provider/SpecificationTypeTest.java
diff --git a/org.eclipse.rmf.reqif10.tests/META-INF/MANIFEST.MF b/org.eclipse.rmf.reqif10.tests/META-INF/MANIFEST.MF
index 22ba0321..39a34032 100644
--- a/org.eclipse.rmf.reqif10.tests/META-INF/MANIFEST.MF
+++ b/org.eclipse.rmf.reqif10.tests/META-INF/MANIFEST.MF
@@ -14,7 +14,7 @@ Require-Bundle: org.apache.xerces,
  org.junit;visibility:=reexport,
  org.eclipse.rmf.serialization;bundle-version="0.4.0",
  org.eclipse.rmf.reqif10.pror;bundle-version="0.4.0",
- org.eclipse.rmf.pror.reqif10.presentation.headline;bundle-version="0.4.0",
+ org.eclipse.rmf.reqif10.pror.presentation.headline;bundle-version="0.4.0",
  org.eclipse.rmf.reqif10.common;bundle-version="0.4.0"
 Bundle-ActivationPolicy: lazy
 Export-Package: org.eclipse.rmf.reqif10.tests.uc001.tc1200,
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java
index 5bf41725..1c74e066 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc3000/TC3000ToolExtensionsModelBuilder.java
@@ -14,8 +14,6 @@ package org.eclipse.rmf.reqif10.tests.uc001.tc3000;
 import java.math.BigInteger;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineFactory;
 import org.eclipse.rmf.reqif10.AttributeDefinitionString;
 import org.eclipse.rmf.reqif10.AttributeValueString;
 import org.eclipse.rmf.reqif10.DatatypeDefinition;
@@ -33,6 +31,8 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrSpecViewConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory;
 import org.eclipse.rmf.reqif10.tests.util.SimpleModelBuilder;
 
 @SuppressWarnings("nls")
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc4000/TC4000ModelBuilder.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc4000/TC4000ModelBuilder.java
index db1d179f..b8512b3b 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc4000/TC4000ModelBuilder.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/uc001/tc4000/TC4000ModelBuilder.java
@@ -16,8 +16,6 @@ import java.math.BigInteger;
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.eclipse.emf.common.util.EList;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineConfiguration;
-import org.eclipse.rmf.pror.presentation.headline.HeadlineFactory;
 import org.eclipse.rmf.reqif10.AlternativeID;
 import org.eclipse.rmf.reqif10.AttributeDefinitionBoolean;
 import org.eclipse.rmf.reqif10.AttributeDefinitionDate;
@@ -48,6 +46,8 @@ import org.eclipse.rmf.reqif10.pror.configuration.ProrGeneralConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrPresentationConfigurations;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrSpecViewConfiguration;
 import org.eclipse.rmf.reqif10.pror.configuration.ProrToolExtension;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineConfiguration;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlineFactory;
 import org.eclipse.rmf.reqif10.tests.util.SimpleModelBuilder;
 
 @SuppressWarnings("nls")
diff --git a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/util/AbstractTestCase.java b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/util/AbstractTestCase.java
index 3328bbbd..179c6dad 100644
--- a/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/util/AbstractTestCase.java
+++ b/org.eclipse.rmf.reqif10.tests/src/org/eclipse/rmf/reqif10/tests/util/AbstractTestCase.java
@@ -45,11 +45,11 @@ import org.eclipse.emf.ecore.resource.impl.ResourceSetImpl;
 import org.eclipse.emf.ecore.xmi.XMLResource;
 import org.eclipse.emf.ecore.xml.namespace.XMLNamespacePackage;
 import org.eclipse.emf.ecore.xml.type.XMLTypePackage;
-import org.eclipse.rmf.pror.presentation.headline.HeadlinePackage;
 import org.eclipse.rmf.reqif10.ReqIF;
 import org.eclipse.rmf.reqif10.ReqIF10Package;
 import org.eclipse.rmf.reqif10.datatypes.DatatypesPackage;
 import org.eclipse.rmf.reqif10.pror.configuration.ConfigurationPackage;
+import org.eclipse.rmf.reqif10.pror.presentation.headline.HeadlinePackage;
 import org.eclipse.rmf.reqif10.xhtml.XhtmlPackage;
 import org.eclipse.rmf.serialization.ReqIFResourceFactoryImpl;
 import org.eclipse.rmf.serialization.ReqIFResourceImpl;
author	Michael Jastram	2012-10-25 14:31:36 +0000
committer	Michael Jastram	2012-10-25 14:31:36 +0000
commit	db783c1003d31f694a69d2378e0485181a3a34d1 (patch)
tree	e3cb2fb042525aa2ffc8e385c44a18867782878e
parent	05c84b6a10606c110b19e1080fe3789bb0a341a0 (diff)
download	org.eclipse.rmf-db783c1003d31f694a69d2378e0485181a3a34d1.tar.gz org.eclipse.rmf-db783c1003d31f694a69d2378e0485181a3a34d1.tar.xz org.eclipse.rmf-db783c1003d31f694a69d2378e0485181a3a34d1.zip