diff --git a/.project b/.project
index ca46730..88bcd68 100644
--- a/.project
+++ b/.project
@@ -1,16 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>scviewer.parent</name>
+	<name>com.minres.scviewer.parent</name>
 	<comment></comment>
 	<projects>
 	</projects>
 	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.m2e.core.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
 	</buildSpec>
 	<natures>
+		<nature>org.eclipse.m2e.core.maven2Nature</nature>
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1591076960924</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -19,7 +25,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960932</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -28,7 +34,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960936</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -37,7 +43,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960939</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -46,7 +52,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960950</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
@@ -55,7 +61,7 @@
 			</matcher>
 		</filter>
 		<filter>
-			<id>1591076960954</id>
+			<id>0</id>
 			<name></name>
 			<type>10</type>
 			<matcher>
diff --git a/.settings/org.eclipse.m2e.core.prefs b/.settings/org.eclipse.m2e.core.prefs
new file mode 100644
index 0000000..f897a7f
--- /dev/null
+++ b/.settings/org.eclipse.m2e.core.prefs
@@ -0,0 +1,4 @@
+activeProfiles=
+eclipse.preferences.version=1
+resolveWorkspaceProjects=true
+version=1
diff --git a/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/com.minres.scviewer.database.test/DatabaseServicesTest.launch
deleted file mode 100644
index f8e3594..0000000
--- a/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.pde.ui.JunitLaunchConfig">
-    <booleanAttribute key="append.args" value="true"/>
-    <stringAttribute key="application" value="org.eclipse.pde.junit.runtime.coretestapplication"/>
-    <booleanAttribute key="askclear" value="false"/>
-    <booleanAttribute key="automaticAdd" value="true"/>
-    <booleanAttribute key="automaticValidate" value="false"/>
-    <stringAttribute key="bootstrap" value=""/>
-    <stringAttribute key="checked" value="[NONE]"/>
-    <booleanAttribute key="clearConfig" value="true"/>
-    <booleanAttribute key="clearws" value="true"/>
-    <booleanAttribute key="clearwslog" value="false"/>
-    <stringAttribute key="configLocation" value="${workspace_loc}/.metadata/.plugins/org.eclipse.pde.core/pde-junit"/>
-    <booleanAttribute key="default" value="true"/>
-    <setAttribute key="deselected_workspace_bundles">
-        <setEntry value="com.minres.scviewer.e4.application"/>
-        <setEntry value="com.minres.scviewer.ui"/>
-    </setAttribute>
-    <booleanAttribute key="includeOptional" value="true"/>
-    <stringAttribute key="location" value="${workspace_loc}/../junit-workspace"/>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-        <listEntry value="/com.minres.scviewer.database.test"/>
-    </listAttribute>
-    <listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-        <listEntry value="4"/>
-    </listAttribute>
-    <stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.minres.scviewer.database.test"/>
-    <booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
-    <stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
-    <stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
-    <booleanAttribute key="org.eclipse.jdt.launching.ATTR_USE_START_ON_FIRST_THREAD" value="true"/>
-    <stringAttribute key="org.eclipse.jdt.launching.JRE_CONTAINER" value="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-    <stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="-os ${target.os} -ws ${target.ws} -arch ${target.arch} -nl ${target.nl} -consoleLog"/>
-    <stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.minres.scviewer.database.test"/>
-    <stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.pde.ui.workbenchClasspathProvider"/>
-    <stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m -Xmx512m"/>
-    <stringAttribute key="pde.version" value="3.3"/>
-    <stringAttribute key="product" value="com.minres.scviewer.e4.product"/>
-    <booleanAttribute key="run_in_ui_thread" value="true"/>
-    <setAttribute key="selected_target_bundles">
-        <setEntry value="com.google.guava@default:default"/>
-        <setEntry value="javax.annotation@default:default"/>
-        <setEntry value="javax.inject@default:default"/>
-        <setEntry value="javax.servlet@default:default"/>
-        <setEntry value="org.apache.ant@default:default"/>
-        <setEntry value="org.apache.commons.jxpath@default:default"/>
-        <setEntry value="org.apache.felix.gogo.command@default:default"/>
-        <setEntry value="org.apache.felix.gogo.runtime@default:default"/>
-        <setEntry value="org.codehaus.groovy@default:default"/>
-        <setEntry value="org.eclipse.ant.core@default:default"/>
-        <setEntry value="org.eclipse.core.commands@default:default"/>
-        <setEntry value="org.eclipse.core.contenttype@default:default"/>
-        <setEntry value="org.eclipse.core.expressions@default:default"/>
-        <setEntry value="org.eclipse.core.filesystem.macosx@default:false"/>
-        <setEntry value="org.eclipse.core.filesystem@default:default"/>
-        <setEntry value="org.eclipse.core.jobs@default:default"/>
-        <setEntry value="org.eclipse.core.resources@default:default"/>
-        <setEntry value="org.eclipse.core.runtime@default:true"/>
-        <setEntry value="org.eclipse.core.variables@default:default"/>
-        <setEntry value="org.eclipse.e4.core.contexts@default:default"/>
-        <setEntry value="org.eclipse.e4.core.di.annotations@default:default"/>
-        <setEntry value="org.eclipse.e4.core.di.extensions@default:default"/>
-        <setEntry value="org.eclipse.e4.core.di@default:default"/>
-        <setEntry value="org.eclipse.e4.core.services@default:default"/>
-        <setEntry value="org.eclipse.e4.emf.xpath@default:default"/>
-        <setEntry value="org.eclipse.e4.ui.di@default:default"/>
-        <setEntry value="org.eclipse.e4.ui.model.workbench@default:default"/>
-        <setEntry value="org.eclipse.e4.ui.services@default:default"/>
-        <setEntry value="org.eclipse.emf.common@default:default"/>
-        <setEntry value="org.eclipse.emf.ecore@default:default"/>
-        <setEntry value="org.eclipse.equinox.app@default:default"/>
-        <setEntry value="org.eclipse.equinox.bidi@default:default"/>
-        <setEntry value="org.eclipse.equinox.common@2:true"/>
-        <setEntry value="org.eclipse.equinox.ds@1:true"/>
-        <setEntry value="org.eclipse.equinox.preferences@default:default"/>
-        <setEntry value="org.eclipse.equinox.registry@default:default"/>
-        <setEntry value="org.eclipse.equinox.util@default:default"/>
-        <setEntry value="org.eclipse.jface@default:default"/>
-        <setEntry value="org.eclipse.osgi.compatibility.state@default:false"/>
-        <setEntry value="org.eclipse.osgi.services@default:default"/>
-        <setEntry value="org.eclipse.osgi@-1:true"/>
-        <setEntry value="org.eclipse.swt.cocoa.macosx.x86_64@default:false"/>
-        <setEntry value="org.eclipse.swt@default:default"/>
-        <setEntry value="org.hamcrest.core@default:default"/>
-        <setEntry value="org.junit@default:default"/>
-    </setAttribute>
-    <setAttribute key="selected_workspace_bundles">
-        <setEntry value="com.minres.scviewer.database.sqlite@default:true"/>
-        <setEntry value="com.minres.scviewer.database.test@default:default"/>
-        <setEntry value="com.minres.scviewer.database.text@default:true"/>
-        <setEntry value="com.minres.scviewer.database.ui.swt@default:default"/>
-        <setEntry value="com.minres.scviewer.database.ui@default:default"/>
-        <setEntry value="com.minres.scviewer.database.vcd@default:default"/>
-        <setEntry value="com.minres.scviewer.database@default:true"/>
-        <setEntry value="com.opcoach.e4.preferences@default:default"/>
-    </setAttribute>
-    <booleanAttribute key="show_selected_only" value="false"/>
-    <booleanAttribute key="tracing" value="false"/>
-    <booleanAttribute key="useCustomFeatures" value="false"/>
-    <booleanAttribute key="useDefaultConfig" value="true"/>
-    <booleanAttribute key="useDefaultConfigArea" value="false"/>
-    <booleanAttribute key="useProduct" value="false"/>
-</launchConfiguration>
diff --git a/com.minres.scviewer.e4.product/scviewer.product b/com.minres.scviewer.e4.product/scviewer.product
index 80bf054..3a9752b 100644
--- a/com.minres.scviewer.e4.product/scviewer.product
+++ b/com.minres.scviewer.e4.product/scviewer.product
@@ -48,9 +48,7 @@
 
    <features>
       <feature id="com.minres.scviewer.e4.feature" installMode="root"/>
-      <feature id="org.eclipse.e4.rcp" installMode="root"/>
-      <feature id="org.eclipse.emf.common" installMode="root"/>
-      <feature id="org.eclipse.emf.ecore" installMode="root"/>
+      <feature id="com.minres.scviewer.e4.platform.feature" installMode="root"/>
    </features>
 
    <configurations>
diff --git a/features/com.minres.scviewer.e4.platform.feature/.gitignore b/features/com.minres.scviewer.e4.platform.feature/.gitignore
new file mode 100644
index 0000000..b83d222
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/.gitignore
@@ -0,0 +1 @@
+/target/
diff --git a/features/com.minres.scviewer.e4.platform.feature/.project b/features/com.minres.scviewer.e4.platform.feature/.project
new file mode 100644
index 0000000..f503e75
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>com.minres.scviewer.e4.platform.feature</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.pde.FeatureBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.FeatureNature</nature>
+	</natures>
+</projectDescription>
diff --git a/features/com.minres.scviewer.e4.platform.feature/build.properties b/features/com.minres.scviewer.e4.platform.feature/build.properties
new file mode 100644
index 0000000..64f93a9
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/build.properties
@@ -0,0 +1 @@
+bin.includes = feature.xml
diff --git a/features/com.minres.scviewer.e4.platform.feature/feature.xml b/features/com.minres.scviewer.e4.platform.feature/feature.xml
new file mode 100644
index 0000000..3a5ab6e
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/feature.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<feature
+      id="com.minres.scviewer.e4.platform.feature"
+      label="SCViewer Platform Feature"
+      version="1.0.0.qualifier"
+      provider-name="MINRES Technologies GmbH">
+
+   <description url="http://www.example.com/description">
+      [Enter Feature Description here.]
+   </description>
+
+   <copyright url="http://www.example.com/copyright">
+      [Enter Copyright Description here.]
+   </copyright>
+
+   <license url="http://www.example.com/license">
+      [Enter License Description here.]
+   </license>
+
+   <includes
+         id="org.eclipse.e4.rcp"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.ecore"
+         version="0.0.0"/>
+
+   <includes
+         id="org.eclipse.emf.common"
+         version="0.0.0"/>
+
+   <requires>
+      <import plugin="org.eclipse.core.expressions" version="3.2.0" match="compatible"/>
+      <import plugin="org.eclipse.core.filesystem" version="1.3.0" match="compatible"/>
+      <import plugin="org.eclipse.core.runtime" version="3.12.0" match="compatible"/>
+   </requires>
+
+   <plugin
+         id="org.eclipse.core.resources"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         unpack="false"/>
+
+   <plugin
+         id="org.eclipse.core.filesystem.linux.x86_64"
+         os="linux"
+         download-size="0"
+         install-size="0"
+         version="0.0.0"
+         fragment="true"
+         unpack="false"/>
+
+</feature>
diff --git a/features/com.minres.scviewer.e4.platform.feature/pom.xml b/features/com.minres.scviewer.e4.platform.feature/pom.xml
new file mode 100644
index 0000000..a74562c
--- /dev/null
+++ b/features/com.minres.scviewer.e4.platform.feature/pom.xml
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>com.minres.scviewer.e4.platform.feature</artifactId>
+  <packaging>eclipse-feature</packaging>
+  <parent>
+  	<groupId>com.minres.scviewer</groupId>
+  	<artifactId>com.minres.scviewer.parent</artifactId>
+  	<version>2.0.0-SNAPSHOT</version>
+	<relativePath>../..</relativePath>
+  </parent>
+  <version>1.0.0-SNAPSHOT</version>
+</project>
diff --git a/pom.xml b/pom.xml
index b7518d0..0130034 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
 		<module>features/com.minres.scviewer.database.feature</module>
 		<module>features/com.minres.scviewer.ui.feature</module>
 		<module>features/com.minres.scviewer.feature</module>
+		<module>features/com.minres.scviewer.e4.platform.feature</module>
 		<module>features/com.minres.scviewer.e4.feature</module>
 		<module>p2repositories//com.minres.scviewer.updateSite</module>
 		<module>com.minres.scviewer.e4.product</module>
diff --git a/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch b/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
index 4937b10..f8e3594 100644
--- a/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
+++ b/tests/com.minres.scviewer.database.test/DatabaseServicesTest.launch
@@ -72,6 +72,7 @@
         <setEntry value="org.eclipse.equinox.app@default:default"/>
         <setEntry value="org.eclipse.equinox.bidi@default:default"/>
         <setEntry value="org.eclipse.equinox.common@2:true"/>
+        <setEntry value="org.eclipse.equinox.ds@1:true"/>
         <setEntry value="org.eclipse.equinox.preferences@default:default"/>
         <setEntry value="org.eclipse.equinox.registry@default:default"/>
         <setEntry value="org.eclipse.equinox.util@default:default"/>