diff --git a/openchrom/cbi/thirdpartylibraries.targetplatform/.project b/openchrom/cbi/net.openchrom.thirdparty.cbi/.project
similarity index 78%
rename from openchrom/cbi/thirdpartylibraries.targetplatform/.project
rename to openchrom/cbi/net.openchrom.thirdparty.cbi/.project
index 63de14d7..19b2ae08 100644
--- a/openchrom/cbi/thirdpartylibraries.targetplatform/.project
+++ b/openchrom/cbi/net.openchrom.thirdparty.cbi/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>thirdpartylibraries.targetplatform</name>
+	<name>net.openchrom.thirdparty.cbi</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/.settings/org.eclipse.core.resources.prefs b/openchrom/cbi/net.openchrom.thirdparty.cbi/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/.settings/org.eclipse.core.resources.prefs
rename to openchrom/cbi/net.openchrom.thirdparty.cbi/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/pom.xml b/openchrom/cbi/net.openchrom.thirdparty.cbi/pom.xml
similarity index 70%
rename from openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/pom.xml
rename to openchrom/cbi/net.openchrom.thirdparty.cbi/pom.xml
index 2271d32f..6ba54088 100644
--- a/openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/pom.xml
+++ b/openchrom/cbi/net.openchrom.thirdparty.cbi/pom.xml
@@ -76,25 +76,25 @@
 	MODULES
   -->
   <modules>
-    <module>../thirdpartylibraries.targetplatform</module>
+    <module>../thirdparty.targetplatform</module>
     <module>../../plugins</module>
     <module>../../features</module>
     <!-- CDK -->
-    <module>../../plugins/net.openchrom.thirdpartylibraries.cdk</module>
-    <module>../../features/net.openchrom.thirdpartylibraries.cdk.feature</module>
+    <module>../../plugins/net.openchrom.thirdparty.cdk</module>
+    <module>../../features/net.openchrom.thirdparty.cdk.feature</module>
     <!-- JHDF5 -->
-    <module>../../plugins/net.openchrom.thirdpartylibraries.jhdf5</module>
-    <module>../../features/net.openchrom.thirdpartylibraries.jhdf5.feature</module>
+    <module>../../plugins/net.openchrom.thirdparty.jhdf5</module>
+    <module>../../features/net.openchrom.thirdparty.jhdf5.feature</module>
     <!-- Mockito -->
-    <module>../../plugins/net.openchrom.thirdpartylibraries.mockito</module>
-    <module>../../features/net.openchrom.thirdpartylibraries.mockito.feature</module>
+    <module>../../plugins/net.openchrom.thirdparty.mockito</module>
+    <module>../../features/net.openchrom.thirdparty.mockito.feature</module>
     <!-- EclipseLink -->
-    <module>../../plugins/net.openchrom.thirdpartylibraries.eclipselink</module>
-    <module>../../features/net.openchrom.thirdpartylibraries.eclipselink.feature</module>
+    <module>../../plugins/net.openchrom.thirdparty.eclipselink</module>
+    <module>../../features/net.openchrom.thirdparty.eclipselink.feature</module>
     <!-- Oracle database driver finder -->
-    <module>../../plugins/net.openchrom.thirdpartylibraries.oracle</module>
-    <module>../../features/net.openchrom.thirdpartylibraries.oracle.feature</module>
+    <module>../../plugins/net.openchrom.thirdparty.oracle</module>
+    <module>../../features/net.openchrom.thirdparty.oracle.feature</module>
     <!-- Update Site (Selected third party libraries) -->
-    <module>../../sites/net.openchrom.thirdpartylibraries.updateSite</module>
+    <module>../../sites/net.openchrom.thirdparty.updateSite</module>
   </modules>
 </project>
\ No newline at end of file
diff --git a/openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/.project b/openchrom/cbi/thirdparty.targetplatform/.project
similarity index 77%
rename from openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/.project
rename to openchrom/cbi/thirdparty.targetplatform/.project
index c1431824..3228f744 100644
--- a/openchrom/cbi/net.openchrom.thirdpartylibraries.cbi/.project
+++ b/openchrom/cbi/thirdparty.targetplatform/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.cbi</name>
+	<name>thirdparty.targetplatform</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/cbi/thirdpartylibraries.targetplatform/.settings/org.eclipse.core.resources.prefs b/openchrom/cbi/thirdparty.targetplatform/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/cbi/thirdpartylibraries.targetplatform/.settings/org.eclipse.core.resources.prefs
rename to openchrom/cbi/thirdparty.targetplatform/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/cbi/thirdpartylibraries.targetplatform/pom.xml b/openchrom/cbi/thirdparty.targetplatform/pom.xml
similarity index 91%
rename from openchrom/cbi/thirdpartylibraries.targetplatform/pom.xml
rename to openchrom/cbi/thirdparty.targetplatform/pom.xml
index 152053f8..8457d81b 100644
--- a/openchrom/cbi/thirdpartylibraries.targetplatform/pom.xml
+++ b/openchrom/cbi/thirdparty.targetplatform/pom.xml
@@ -1,7 +1,7 @@
 <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>thirdpartylibraries.targetplatform</artifactId>
+	<artifactId>thirdparty.targetplatform</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<name>Target Project</name>
 	<description>This contains the target definition used to build openchrom 3rpl</description>
diff --git a/openchrom/cbi/thirdpartylibraries.targetplatform/thirdpartylibraries.targetplatform.target b/openchrom/cbi/thirdparty.targetplatform/thirdpartylibraries.targetplatform.target
similarity index 100%
rename from openchrom/cbi/thirdpartylibraries.targetplatform/thirdpartylibraries.targetplatform.target
rename to openchrom/cbi/thirdparty.targetplatform/thirdpartylibraries.targetplatform.target
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/.project b/openchrom/features/net.openchrom.thirdparty.cdk.feature/.project
similarity index 85%
rename from openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/.project
rename to openchrom/features/net.openchrom.thirdparty.cdk.feature/.project
index 4c463495..2b344cb7 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/.project
+++ b/openchrom/features/net.openchrom.thirdparty.cdk.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.cdk.feature</name>
+	<name>net.openchrom.thirdparty.cdk.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/.settings/org.eclipse.core.resources.prefs b/openchrom/features/net.openchrom.thirdparty.cdk.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/.settings/org.eclipse.core.resources.prefs
rename to openchrom/features/net.openchrom.thirdparty.cdk.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/build.properties b/openchrom/features/net.openchrom.thirdparty.cdk.feature/build.properties
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/build.properties
rename to openchrom/features/net.openchrom.thirdparty.cdk.feature/build.properties
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/feature.xml b/openchrom/features/net.openchrom.thirdparty.cdk.feature/feature.xml
similarity index 92%
rename from openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/feature.xml
rename to openchrom/features/net.openchrom.thirdparty.cdk.feature/feature.xml
index a7a4ec45..10a6a962 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/feature.xml
+++ b/openchrom/features/net.openchrom.thirdparty.cdk.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="net.openchrom.thirdpartylibraries.cdk.feature"
+      id="net.openchrom.thirdparty.cdk.feature"
       label="CDK (Chemistry Development Kit)"
       version="2.8.0.qualifier"
       provider-name="OpenChrom">
@@ -38,7 +38,7 @@ USA
    </url>
 
    <plugin
-         id="net.openchrom.thirdpartylibraries.cdk"
+         id="net.openchrom.thirdparty.cdk"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/pom.xml b/openchrom/features/net.openchrom.thirdparty.cdk.feature/pom.xml
similarity index 82%
rename from openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/pom.xml
rename to openchrom/features/net.openchrom.thirdparty.cdk.feature/pom.xml
index 04175f8e..13d46687 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.cdk.feature/pom.xml
+++ b/openchrom/features/net.openchrom.thirdparty.cdk.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.cdk.feature</artifactId>
+  <artifactId>net.openchrom.thirdparty.cdk.feature</artifactId>
   <version>2.8.0-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/.project b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/.project
similarity index 84%
rename from openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/.project
rename to openchrom/features/net.openchrom.thirdparty.eclipselink.feature/.project
index 165a4d35..467c16a1 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/.project
+++ b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.jhdf5.feature</name>
+	<name>net.openchrom.thirdparty.eclipselink.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/.settings/org.eclipse.core.resources.prefs b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/.settings/org.eclipse.core.resources.prefs
rename to openchrom/features/net.openchrom.thirdparty.eclipselink.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/build.properties b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/build.properties
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/build.properties
rename to openchrom/features/net.openchrom.thirdparty.eclipselink.feature/build.properties
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/feature.xml b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/feature.xml
similarity index 87%
rename from openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/feature.xml
rename to openchrom/features/net.openchrom.thirdparty.eclipselink.feature/feature.xml
index c50851d7..1e0da6d4 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/feature.xml
+++ b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="net.openchrom.thirdpartylibraries.eclipselink.feature"
+      id="net.openchrom.thirdparty.eclipselink.feature"
       label="EclipseLink"
       version="2.7.10.qualifier"
       provider-name="OpenChrom">
@@ -23,7 +23,7 @@ http://www.eclipse.org/legal/epl-v10.html
    </license>
 
    <plugin
-         id="net.openchrom.thirdpartylibraries.eclipselink"
+         id="net.openchrom.thirdparty.eclipselink"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/pom.xml b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/pom.xml
similarity index 80%
rename from openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/pom.xml
rename to openchrom/features/net.openchrom.thirdparty.eclipselink.feature/pom.xml
index b84bfa3f..5d13fa0e 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/pom.xml
+++ b/openchrom/features/net.openchrom.thirdparty.eclipselink.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.eclipselink.feature</artifactId>
+  <artifactId>net.openchrom.thirdparty.eclipselink.feature</artifactId>
   <version>2.7.10-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
 
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/.project b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/.project
similarity index 84%
rename from openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/.project
rename to openchrom/features/net.openchrom.thirdparty.jhdf5.feature/.project
index 934c7062..879304ad 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/.project
+++ b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.oracle.feature</name>
+	<name>net.openchrom.thirdparty.jhdf5.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/.settings/org.eclipse.core.resources.prefs b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/.settings/org.eclipse.core.resources.prefs
rename to openchrom/features/net.openchrom.thirdparty.jhdf5.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/build.properties b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/build.properties
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/build.properties
rename to openchrom/features/net.openchrom.thirdparty.jhdf5.feature/build.properties
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/feature.xml b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/feature.xml
similarity index 91%
rename from openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/feature.xml
rename to openchrom/features/net.openchrom.thirdparty.jhdf5.feature/feature.xml
index e27c77ba..e92a8697 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/feature.xml
+++ b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="net.openchrom.thirdpartylibraries.jhdf5.feature"
+      id="net.openchrom.thirdparty.jhdf5.feature"
       label="JHDF5"
       version="19.4.1.qualifier"
       provider-name="OpenChrom">
@@ -30,7 +30,7 @@ limitations under the License.
    </license>
 
    <plugin
-         id="net.openchrom.thirdpartylibraries.jhdf5"
+         id="net.openchrom.thirdparty.jhdf5"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/pom.xml b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/pom.xml
similarity index 81%
rename from openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/pom.xml
rename to openchrom/features/net.openchrom.thirdparty.jhdf5.feature/pom.xml
index b32de23c..caa62672 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.jhdf5.feature/pom.xml
+++ b/openchrom/features/net.openchrom.thirdparty.jhdf5.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.jhdf5.feature</artifactId>
+  <artifactId>net.openchrom.thirdparty.jhdf5.feature</artifactId>
   <version>19.4.1-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/.project b/openchrom/features/net.openchrom.thirdparty.mockito.feature/.project
similarity index 84%
rename from openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/.project
rename to openchrom/features/net.openchrom.thirdparty.mockito.feature/.project
index 63133456..938bfa5e 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/.project
+++ b/openchrom/features/net.openchrom.thirdparty.mockito.feature/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.mockito.feature</name>
+	<name>net.openchrom.thirdparty.mockito.feature</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/.settings/org.eclipse.core.resources.prefs b/openchrom/features/net.openchrom.thirdparty.mockito.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/.settings/org.eclipse.core.resources.prefs
rename to openchrom/features/net.openchrom.thirdparty.mockito.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/build.properties b/openchrom/features/net.openchrom.thirdparty.mockito.feature/build.properties
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/build.properties
rename to openchrom/features/net.openchrom.thirdparty.mockito.feature/build.properties
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/feature.xml b/openchrom/features/net.openchrom.thirdparty.mockito.feature/feature.xml
similarity index 94%
rename from openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/feature.xml
rename to openchrom/features/net.openchrom.thirdparty.mockito.feature/feature.xml
index 234a4990..d1e03343 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/feature.xml
+++ b/openchrom/features/net.openchrom.thirdparty.mockito.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="net.openchrom.thirdpartylibraries.mockito.feature"
+      id="net.openchrom.thirdparty.mockito.feature"
       label="Mockito"
       version="2.0.2.qualifier"
       provider-name="OpenChrom">
@@ -43,7 +43,7 @@ WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
    </url>
 
    <plugin
-         id="net.openchrom.thirdpartylibraries.mockito"
+         id="net.openchrom.thirdparty.mockito"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/pom.xml b/openchrom/features/net.openchrom.thirdparty.mockito.feature/pom.xml
similarity index 81%
rename from openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/pom.xml
rename to openchrom/features/net.openchrom.thirdparty.mockito.feature/pom.xml
index 3cd556a5..5bc2c517 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.mockito.feature/pom.xml
+++ b/openchrom/features/net.openchrom.thirdparty.mockito.feature/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.mockito.feature</artifactId>
+  <artifactId>net.openchrom.thirdparty.mockito.feature</artifactId>
   <version>2.0.2-SNAPSHOT</version>
   <packaging>eclipse-feature</packaging>
   
diff --git a/openchrom/features/net.openchrom.thirdparty.oracle.feature/.project b/openchrom/features/net.openchrom.thirdparty.oracle.feature/.project
new file mode 100644
index 00000000..8715bff2
--- /dev/null
+++ b/openchrom/features/net.openchrom.thirdparty.oracle.feature/.project
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.openchrom.thirdparty.oracle.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/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/.settings/org.eclipse.core.resources.prefs b/openchrom/features/net.openchrom.thirdparty.oracle.feature/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/.settings/org.eclipse.core.resources.prefs
rename to openchrom/features/net.openchrom.thirdparty.oracle.feature/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/build.properties b/openchrom/features/net.openchrom.thirdparty.oracle.feature/build.properties
similarity index 100%
rename from openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/build.properties
rename to openchrom/features/net.openchrom.thirdparty.oracle.feature/build.properties
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/feature.xml b/openchrom/features/net.openchrom.thirdparty.oracle.feature/feature.xml
similarity index 81%
rename from openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/feature.xml
rename to openchrom/features/net.openchrom.thirdparty.oracle.feature/feature.xml
index 586d6055..7ef24a3f 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/feature.xml
+++ b/openchrom/features/net.openchrom.thirdparty.oracle.feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <feature
-      id="net.openchrom.thirdpartylibraries.oracle.feature"
+      id="net.openchrom.thirdparty.oracle.feature"
       label="Oracle DB"
       version="1.0.0.qualifier"
       provider-name="OpenChrom">
@@ -11,7 +11,7 @@ This feature encapsulates a wrapper that allows to drop in Oracle JDBC.
    </description>
 
    <plugin
-         id="net.openchrom.thirdpartylibraries.oracle"
+         id="net.openchrom.thirdparty.oracle"
          download-size="0"
          install-size="0"
          version="0.0.0"
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/pom.xml b/openchrom/features/net.openchrom.thirdparty.oracle.feature/pom.xml
similarity index 81%
rename from openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/pom.xml
rename to openchrom/features/net.openchrom.thirdparty.oracle.feature/pom.xml
index 73df39b9..d1b79ed1 100644
--- a/openchrom/features/net.openchrom.thirdpartylibraries.oracle.feature/pom.xml
+++ b/openchrom/features/net.openchrom.thirdparty.oracle.feature/pom.xml
@@ -8,7 +8,7 @@
 		<version>BUILD-VERSION</version>
 	</parent>
 
-	<artifactId>net.openchrom.thirdpartylibraries.oracle.feature</artifactId>
+	<artifactId>net.openchrom.thirdparty.oracle.feature</artifactId>
 	<version>1.0.0-SNAPSHOT</version>
 	<packaging>eclipse-feature</packaging>
 </project>
diff --git a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/.project b/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/.project
deleted file mode 100644
index 7a094d5e..00000000
--- a/openchrom/features/net.openchrom.thirdpartylibraries.eclipselink.feature/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>net.openchrom.thirdpartylibraries.eclipselink.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/openchrom/features/pom.xml b/openchrom/features/pom.xml
index 5bf13160..12ecd410 100644
--- a/openchrom/features/pom.xml
+++ b/openchrom/features/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>net.openchrom</groupId>
 		<artifactId>parent</artifactId>
 		<version>BUILD-VERSION</version>
-		<relativePath>../cbi/net.openchrom.thirdpartylibraries.cbi/pom.xml</relativePath>
+		<relativePath>../cbi/net.openchrom.thirdparty.cbi/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>net.openchrom.features.parent</artifactId>
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.classpath b/openchrom/plugins/net.openchrom.thirdparty.cdk/.classpath
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.classpath
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/.classpath
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.gitignore b/openchrom/plugins/net.openchrom.thirdparty.cdk/.gitignore
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.gitignore
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/.gitignore
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.project b/openchrom/plugins/net.openchrom.thirdparty.cdk/.project
similarity index 92%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.project
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/.project
index c779a420..9e36f63c 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.project
+++ b/openchrom/plugins/net.openchrom.thirdparty.cdk/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.cdk</name>
+	<name>net.openchrom.thirdparty.cdk</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.settings/org.eclipse.core.resources.prefs b/openchrom/plugins/net.openchrom.thirdparty.cdk/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.settings/org.eclipse.core.resources.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.settings/org.eclipse.jdt.core.prefs b/openchrom/plugins/net.openchrom.thirdparty.cdk/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/.settings/org.eclipse.jdt.core.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/.settings/org.eclipse.jdt.core.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/META-INF/MANIFEST.MF b/openchrom/plugins/net.openchrom.thirdparty.cdk/META-INF/MANIFEST.MF
similarity index 96%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/META-INF/MANIFEST.MF
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/META-INF/MANIFEST.MF
index c594c7b3..018ec79b 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/META-INF/MANIFEST.MF
+++ b/openchrom/plugins/net.openchrom.thirdparty.cdk/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: net.openchrom.thirdpartylibraries.cdk
+Automatic-Module-Name: net.openchrom.thirdparty.cdk
 Eclipse-BuddyPolicy: registered
 Bundle-ManifestVersion: 2
 Bundle-Name: CDK (Chemistry Development Kit)
-Bundle-SymbolicName: net.openchrom.thirdpartylibraries.cdk;singleton:=true
+Bundle-SymbolicName: net.openchrom.thirdparty.cdk;singleton:=true
 Bundle-Version: 2.9.0.qualifier
-Bundle-Activator: net.openchrom.thirdpartylibraries.cdk.Activator
+Bundle-Activator: net.openchrom.thirdparty.cdk.Activator
 Bundle-Vendor: The OpenScience Project
 Require-Bundle: org.eclipse.core.runtime,
  javax.vecmath;bundle-version="1.5.2",
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/build.properties b/openchrom/plugins/net.openchrom.thirdparty.cdk/build.properties
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/build.properties
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/build.properties
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/libraries/cdk-2.9.jar b/openchrom/plugins/net.openchrom.thirdparty.cdk/libraries/cdk-2.9.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/libraries/cdk-2.9.jar
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/libraries/cdk-2.9.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/pom.xml b/openchrom/plugins/net.openchrom.thirdparty.cdk/pom.xml
similarity index 83%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/pom.xml
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/pom.xml
index c8c603f8..67fecdbd 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/pom.xml
+++ b/openchrom/plugins/net.openchrom.thirdparty.cdk/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.cdk</artifactId>
+  <artifactId>net.openchrom.thirdparty.cdk</artifactId>
   <version>2.9.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/src/net/openchrom/thirdpartylibraries/cdk/Activator.java b/openchrom/plugins/net.openchrom.thirdparty.cdk/src/net/openchrom/thirdpartylibraries/cdk/Activator.java
similarity index 97%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/src/net/openchrom/thirdpartylibraries/cdk/Activator.java
rename to openchrom/plugins/net.openchrom.thirdparty.cdk/src/net/openchrom/thirdpartylibraries/cdk/Activator.java
index eb076fa3..02ae1b28 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.cdk/src/net/openchrom/thirdpartylibraries/cdk/Activator.java
+++ b/openchrom/plugins/net.openchrom.thirdparty.cdk/src/net/openchrom/thirdpartylibraries/cdk/Activator.java
@@ -12,7 +12,7 @@
  * License along with this library; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  *******************************************************************************/
-package net.openchrom.thirdpartylibraries.cdk;
+package net.openchrom.thirdparty.cdk;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.classpath b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/.classpath
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.classpath
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/.classpath
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.project b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/.project
similarity index 91%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.project
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/.project
index 71186493..0a2b3ce1 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.project
+++ b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.oracle</name>
+	<name>net.openchrom.thirdparty.eclipselink</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.settings/org.eclipse.core.resources.prefs b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.settings/org.eclipse.core.resources.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.settings/org.eclipse.jdt.core.prefs b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.settings/org.eclipse.jdt.core.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/.settings/org.eclipse.jdt.core.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/META-INF/MANIFEST.MF b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/META-INF/MANIFEST.MF
similarity index 98%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/META-INF/MANIFEST.MF
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/META-INF/MANIFEST.MF
index dea7f0ad..79285397 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/META-INF/MANIFEST.MF
+++ b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: net.openchrom.thirdpartylibraries.eclipselink
+Automatic-Module-Name: net.openchrom.thirdparty.eclipselink
 Eclipse-BuddyPolicy: registered
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipselink
-Bundle-SymbolicName: net.openchrom.thirdpartylibraries.eclipselink
+Bundle-SymbolicName: net.openchrom.thirdparty.eclipselink
 Bundle-Version: 2.7.10.qualifier
-Bundle-Activator: net.openchrom.thirdpartylibraries.eclipselink.Activator
+Bundle-Activator: net.openchrom.thirdparty.eclipselink.Activator
 Bundle-Vendor: OpenChrom
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/build.properties b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/build.properties
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/build.properties
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/build.properties
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/Model-Generator-Tycho.txt b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/Model-Generator-Tycho.txt
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/Model-Generator-Tycho.txt
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/Model-Generator-Tycho.txt
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/eclipselink.jar b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/eclipselink.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/eclipselink.jar
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/eclipselink.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/jakarta.persistence.source_2.2.3.jar b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/jakarta.persistence.source_2.2.3.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/jakarta.persistence.source_2.2.3.jar
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/jakarta.persistence.source_2.2.3.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/jakarta.persistence_2.2.3.jar b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/jakarta.persistence_2.2.3.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/libraries/jakarta.persistence_2.2.3.jar
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/libraries/jakarta.persistence_2.2.3.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/pom.xml b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/pom.xml
similarity index 81%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/pom.xml
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/pom.xml
index a4490f1e..77130bb7 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/pom.xml
+++ b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.eclipselink</artifactId>
+  <artifactId>net.openchrom.thirdparty.eclipselink</artifactId>
   <version>2.7.10-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
 
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/src/net/openchrom/thirdpartylibraries/eclipselink/Activator.java b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/src/net/openchrom/thirdpartylibraries/eclipselink/Activator.java
similarity index 95%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/src/net/openchrom/thirdpartylibraries/eclipselink/Activator.java
rename to openchrom/plugins/net.openchrom.thirdparty.eclipselink/src/net/openchrom/thirdpartylibraries/eclipselink/Activator.java
index a39d8ade..43ae89ca 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/src/net/openchrom/thirdpartylibraries/eclipselink/Activator.java
+++ b/openchrom/plugins/net.openchrom.thirdparty.eclipselink/src/net/openchrom/thirdpartylibraries/eclipselink/Activator.java
@@ -9,7 +9,7 @@
  * Contributors:
  * Philip Wenig - initial API and implementation
  *******************************************************************************/
-package net.openchrom.thirdpartylibraries.eclipselink;
+package net.openchrom.thirdparty.eclipselink;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.classpath b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.classpath
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.classpath
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/.classpath
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.gitignore b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.gitignore
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.gitignore
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/.gitignore
diff --git a/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.project b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.project
new file mode 100644
index 00000000..49fcaaef
--- /dev/null
+++ b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.project
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>net.openchrom.thirdparty.jhdf5</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.ManifestBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.pde.SchemaBuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.pde.PluginNature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.settings/org.eclipse.core.resources.prefs b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.settings/org.eclipse.core.resources.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.settings/org.eclipse.jdt.core.prefs b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.settings/org.eclipse.jdt.core.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/.settings/org.eclipse.jdt.core.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/META-INF/MANIFEST.MF b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/META-INF/MANIFEST.MF
similarity index 86%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/META-INF/MANIFEST.MF
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/META-INF/MANIFEST.MF
index 4586f084..ece774c4 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/META-INF/MANIFEST.MF
+++ b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/META-INF/MANIFEST.MF
@@ -1,9 +1,9 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: net.openchrom.thirdpartylibraries.jhdf5
+Automatic-Module-Name: net.openchrom.thirdparty.jhdf5
 Eclipse-BundleShape: dir
 Bundle-ManifestVersion: 2
 Bundle-Name: JHDF5
-Bundle-SymbolicName: net.openchrom.thirdpartylibraries.jhdf5
+Bundle-SymbolicName: net.openchrom.thirdparty.jhdf5
 Bundle-Version: 19.4.1.qualifier
 Export-Package: ch.systemsx.cisd.base,
  ch.systemsx.cisd.base.annotation,
@@ -27,7 +27,7 @@ Export-Package: ch.systemsx.cisd.base,
  hdf.hdf5lib.callbacks,
  hdf.hdf5lib.exceptions,
  hdf.hdf5lib.structs
-Bundle-Activator: net.openchrom.thirdpartylibraries.jhdf5.Activator
+Bundle-Activator: net.openchrom.thirdparty.jhdf5.Activator
 Bundle-Vendor: SISD
 Require-Bundle: org.eclipse.core.runtime,
  org.apache.commons.commons-io;bundle-version="2.8.0",
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/build.properties b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/build.properties
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/build.properties
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/build.properties
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/aarch64-Mac OS X/libjhdf5.jnilib b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/aarch64-Mac OS X/libjhdf5.jnilib
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/aarch64-Mac OS X/libjhdf5.jnilib
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/aarch64-Mac OS X/libjhdf5.jnilib
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/amd64-Linux/libjhdf5.so b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/amd64-Linux/libjhdf5.so
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/amd64-Linux/libjhdf5.so
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/amd64-Linux/libjhdf5.so
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/amd64-Windows/jhdf5.dll b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/amd64-Windows/jhdf5.dll
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/amd64-Windows/jhdf5.dll
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/amd64-Windows/jhdf5.dll
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/arm-Linux/libjhdf5.so b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/arm-Linux/libjhdf5.so
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/arm-Linux/libjhdf5.so
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/arm-Linux/libjhdf5.so
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/x86_64-Mac OS X/libjhdf5.jnilib b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/x86_64-Mac OS X/libjhdf5.jnilib
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/jhdf5/x86_64-Mac OS X/libjhdf5.jnilib
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/jhdf5/x86_64-Mac OS X/libjhdf5.jnilib
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/amd64-Linux/libnativedata.so b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/amd64-Linux/libnativedata.so
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/amd64-Linux/libnativedata.so
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/amd64-Linux/libnativedata.so
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/amd64-Windows/nativedata.dll b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/amd64-Windows/nativedata.dll
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/amd64-Windows/nativedata.dll
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/amd64-Windows/nativedata.dll
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/arm-Linux/libnativedata.so b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/arm-Linux/libnativedata.so
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/arm-Linux/libnativedata.so
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/arm-Linux/libnativedata.so
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/nativedata/x86_64-Mac OS X/libnativedata.jnilib
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/unix/amd64-Linux/libunix.so b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/unix/amd64-Linux/libunix.so
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/unix/amd64-Linux/libunix.so
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/unix/amd64-Linux/libunix.so
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/unix/arm-Linux/libunix.so b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/unix/arm-Linux/libunix.so
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/unix/arm-Linux/libunix.so
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/unix/arm-Linux/libunix.so
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/unix/x86_64-Mac OS X/libunix.jnilib b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/unix/x86_64-Mac OS X/libunix.jnilib
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/native/unix/x86_64-Mac OS X/libunix.jnilib
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/native/unix/x86_64-Mac OS X/libunix.jnilib
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-base-18.09.0-sources.jar b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-base-18.09.0-sources.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-base-18.09.0-sources.jar
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-base-18.09.0-sources.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-base-18.09.0.jar b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-base-18.09.0.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-base-18.09.0.jar
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-base-18.09.0.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-jhdf5-19.04.1-sources.jar b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-jhdf5-19.04.1-sources.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-jhdf5-19.04.1-sources.jar
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-jhdf5-19.04.1-sources.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-jhdf5-19.04.1.jar b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-jhdf5-19.04.1.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/libraries/sis-jhdf5-19.04.1.jar
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/libraries/sis-jhdf5-19.04.1.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/licenses/COPYING b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/licenses/COPYING
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/licenses/COPYING
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/licenses/COPYING
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/licenses/COPYING-hdf5 b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/licenses/COPYING-hdf5
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/licenses/COPYING-hdf5
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/licenses/COPYING-hdf5
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/licenses/LICENSE b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/licenses/LICENSE
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/licenses/LICENSE
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/licenses/LICENSE
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/pom.xml b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/pom.xml
similarity index 83%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/pom.xml
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/pom.xml
index 0f2c142c..362dd819 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/pom.xml
+++ b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.jhdf5</artifactId>
+  <artifactId>net.openchrom.thirdparty.jhdf5</artifactId>
   <packaging>eclipse-plugin</packaging>
   <version>19.4.1-SNAPSHOT</version>
   
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/src/net/openchrom/thirdpartylibraries/jhdf5/Activator.java b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/src/net/openchrom/thirdpartylibraries/jhdf5/Activator.java
similarity index 89%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/src/net/openchrom/thirdpartylibraries/jhdf5/Activator.java
rename to openchrom/plugins/net.openchrom.thirdparty.jhdf5/src/net/openchrom/thirdpartylibraries/jhdf5/Activator.java
index f03b8a32..1053e0c4 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/src/net/openchrom/thirdpartylibraries/jhdf5/Activator.java
+++ b/openchrom/plugins/net.openchrom.thirdparty.jhdf5/src/net/openchrom/thirdpartylibraries/jhdf5/Activator.java
@@ -1,4 +1,4 @@
-package net.openchrom.thirdpartylibraries.jhdf5;
+package net.openchrom.thirdparty.jhdf5;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.classpath b/openchrom/plugins/net.openchrom.thirdparty.mockito/.classpath
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.classpath
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/.classpath
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.gitignore b/openchrom/plugins/net.openchrom.thirdparty.mockito/.gitignore
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.gitignore
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/.gitignore
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.project b/openchrom/plugins/net.openchrom.thirdparty.mockito/.project
similarity index 91%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.project
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/.project
index 68144844..3536b9dd 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.project
+++ b/openchrom/plugins/net.openchrom.thirdparty.mockito/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.mockito</name>
+	<name>net.openchrom.thirdparty.mockito</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.settings/org.eclipse.core.resources.prefs b/openchrom/plugins/net.openchrom.thirdparty.mockito/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.settings/org.eclipse.core.resources.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.settings/org.eclipse.jdt.core.prefs b/openchrom/plugins/net.openchrom.thirdparty.mockito/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/.settings/org.eclipse.jdt.core.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/.settings/org.eclipse.jdt.core.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/META-INF/MANIFEST.MF b/openchrom/plugins/net.openchrom.thirdparty.mockito/META-INF/MANIFEST.MF
similarity index 93%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/META-INF/MANIFEST.MF
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/META-INF/MANIFEST.MF
index e2f00ffb..c7b39574 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/META-INF/MANIFEST.MF
+++ b/openchrom/plugins/net.openchrom.thirdparty.mockito/META-INF/MANIFEST.MF
@@ -1,11 +1,11 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: net.openchrom.thirdpartylibraries.mockito
+Automatic-Module-Name: net.openchrom.thirdparty.mockito
 Eclipse-BuddyPolicy: registered
 Bundle-ManifestVersion: 2
 Bundle-Name: Mockito
-Bundle-SymbolicName: net.openchrom.thirdpartylibraries.mockito
+Bundle-SymbolicName: net.openchrom.thirdparty.mockito
 Bundle-Version: 2.0.2.qualifier
-Bundle-Activator: net.openchrom.thirdpartylibraries.mockito.Activator
+Bundle-Activator: net.openchrom.thirdparty.mockito.Activator
 Bundle-Vendor: OpenChrom
 Require-Bundle: org.eclipse.core.runtime
 Bundle-RequiredExecutionEnvironment: JavaSE-17
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/build.properties b/openchrom/plugins/net.openchrom.thirdparty.mockito/build.properties
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/build.properties
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/build.properties
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/libraries/LICENSE b/openchrom/plugins/net.openchrom.thirdparty.mockito/libraries/LICENSE
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/libraries/LICENSE
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/libraries/LICENSE
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/libraries/mockito-all-2.0.2-beta.jar b/openchrom/plugins/net.openchrom.thirdparty.mockito/libraries/mockito-all-2.0.2-beta.jar
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/libraries/mockito-all-2.0.2-beta.jar
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/libraries/mockito-all-2.0.2-beta.jar
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/pom.xml b/openchrom/plugins/net.openchrom.thirdparty.mockito/pom.xml
similarity index 82%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/pom.xml
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/pom.xml
index 4f09a957..b5a47de5 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/pom.xml
+++ b/openchrom/plugins/net.openchrom.thirdparty.mockito/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.mockito</artifactId>
+  <artifactId>net.openchrom.thirdparty.mockito</artifactId>
   <version>2.0.2-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/src/net/openchrom/thirdpartylibraries/mockito/Activator.java b/openchrom/plugins/net.openchrom.thirdparty.mockito/src/net/openchrom/thirdpartylibraries/mockito/Activator.java
similarity index 97%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/src/net/openchrom/thirdpartylibraries/mockito/Activator.java
rename to openchrom/plugins/net.openchrom.thirdparty.mockito/src/net/openchrom/thirdpartylibraries/mockito/Activator.java
index 7151b567..88b9c6ae 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.mockito/src/net/openchrom/thirdpartylibraries/mockito/Activator.java
+++ b/openchrom/plugins/net.openchrom.thirdparty.mockito/src/net/openchrom/thirdpartylibraries/mockito/Activator.java
@@ -20,7 +20,7 @@
  * NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
  * WITH THE ACCESS, USE OR PERFORMANCE OF THIS SOFTWARE.
  *******************************************************************************/
-package net.openchrom.thirdpartylibraries.mockito;
+package net.openchrom.thirdparty.mockito;
 
 import org.osgi.framework.BundleActivator;
 import org.osgi.framework.BundleContext;
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.classpath b/openchrom/plugins/net.openchrom.thirdparty.oracle/.classpath
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.classpath
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/.classpath
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.project b/openchrom/plugins/net.openchrom.thirdparty.oracle/.project
similarity index 91%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.project
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/.project
index 1130342f..1c85dba2 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.eclipselink/.project
+++ b/openchrom/plugins/net.openchrom.thirdparty.oracle/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.eclipselink</name>
+	<name>net.openchrom.thirdparty.oracle</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.settings/org.eclipse.core.resources.prefs b/openchrom/plugins/net.openchrom.thirdparty.oracle/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.settings/org.eclipse.core.resources.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.settings/org.eclipse.jdt.core.prefs b/openchrom/plugins/net.openchrom.thirdparty.oracle/.settings/org.eclipse.jdt.core.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.settings/org.eclipse.jdt.core.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/.settings/org.eclipse.jdt.core.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.settings/org.eclipse.pde.core.prefs b/openchrom/plugins/net.openchrom.thirdparty.oracle/.settings/org.eclipse.pde.core.prefs
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/.settings/org.eclipse.pde.core.prefs
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/.settings/org.eclipse.pde.core.prefs
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/META-INF/MANIFEST.MF b/openchrom/plugins/net.openchrom.thirdparty.oracle/META-INF/MANIFEST.MF
similarity index 63%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/META-INF/MANIFEST.MF
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/META-INF/MANIFEST.MF
index 65c6fa04..6002f1d9 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/META-INF/MANIFEST.MF
+++ b/openchrom/plugins/net.openchrom.thirdparty.oracle/META-INF/MANIFEST.MF
@@ -1,10 +1,10 @@
 Manifest-Version: 1.0
-Automatic-Module-Name: net.openchrom.thirdpartylibraries.oracle
+Automatic-Module-Name: net.openchrom.thirdparty.oracle
 Bundle-ManifestVersion: 2
 Bundle-Name: Oracle OSGi JDBC DataSourceFactory Facade
-Bundle-SymbolicName: net.openchrom.thirdpartylibraries.oracle
+Bundle-SymbolicName: net.openchrom.thirdparty.oracle
 Bundle-Version: 1.0.0.qualifier
-Bundle-Activator: net.openchrom.thirdpartylibraries.oracle.OracleDataSourceFactoryActivator
+Bundle-Activator: net.openchrom.thirdparty.oracle.OracleDataSourceFactoryActivator
 Bundle-Vendor: LABLICATE
 Bundle-RequiredExecutionEnvironment: JavaSE-17
 Import-Package: org.osgi.framework;version="1.3.0",
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/build.properties b/openchrom/plugins/net.openchrom.thirdparty.oracle/build.properties
similarity index 100%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/build.properties
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/build.properties
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/pom.xml b/openchrom/plugins/net.openchrom.thirdparty.oracle/pom.xml
similarity index 83%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/pom.xml
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/pom.xml
index a6572756..09ca95dc 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/pom.xml
+++ b/openchrom/plugins/net.openchrom.thirdparty.oracle/pom.xml
@@ -8,7 +8,7 @@
     <version>BUILD-VERSION</version>
   </parent>
 
-  <artifactId>net.openchrom.thirdpartylibraries.oracle</artifactId>
+  <artifactId>net.openchrom.thirdparty.oracle</artifactId>
   <version>1.0.0-SNAPSHOT</version>
   <packaging>eclipse-plugin</packaging>
   
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactory.java b/openchrom/plugins/net.openchrom.thirdparty.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactory.java
similarity index 98%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactory.java
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactory.java
index 0b0cb56a..859580dd 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactory.java
+++ b/openchrom/plugins/net.openchrom.thirdparty.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactory.java
@@ -10,7 +10,7 @@
  * Christoph Läubrich - initial api and implementation
  * Philip Wenig - reduce compiler warnings
  *******************************************************************************/
-package net.openchrom.thirdpartylibraries.oracle;
+package net.openchrom.thirdparty.oracle;
 
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactoryActivator.java b/openchrom/plugins/net.openchrom.thirdparty.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactoryActivator.java
similarity index 98%
rename from openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactoryActivator.java
rename to openchrom/plugins/net.openchrom.thirdparty.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactoryActivator.java
index 3cc91055..6c0fb781 100644
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactoryActivator.java
+++ b/openchrom/plugins/net.openchrom.thirdparty.oracle/src/net/openchrom/thirdpartylibraries/oracle/OracleDataSourceFactoryActivator.java
@@ -10,7 +10,7 @@
  * Christoph Läubrich - initial api and implementation
  * Philip Wenig - refactoring logger
  *******************************************************************************/
-package net.openchrom.thirdpartylibraries.oracle;
+package net.openchrom.thirdparty.oracle;
 
 import java.io.File;
 import java.net.URL;
diff --git a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.project b/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.project
deleted file mode 100644
index 3737354e..00000000
--- a/openchrom/plugins/net.openchrom.thirdpartylibraries.jhdf5/.project
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>net.openchrom.thirdpartylibraries.jhdf5</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.ManifestBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.pde.SchemaBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.pde.PluginNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/openchrom/plugins/pom.xml b/openchrom/plugins/pom.xml
index 30ec3ba1..782d8425 100644
--- a/openchrom/plugins/pom.xml
+++ b/openchrom/plugins/pom.xml
@@ -6,7 +6,7 @@
 		<groupId>net.openchrom</groupId>
 		<artifactId>parent</artifactId>
 		<version>BUILD-VERSION</version>
-		<relativePath>../cbi/net.openchrom.thirdpartylibraries.cbi/pom.xml</relativePath>
+		<relativePath>../cbi/net.openchrom.thirdparty.cbi/pom.xml</relativePath>
 	</parent>
 
 	<artifactId>net.openchrom.plugins.parent</artifactId>
diff --git a/openchrom/pom.xml b/openchrom/pom.xml
index 88b72fe0..b732884f 100644
--- a/openchrom/pom.xml
+++ b/openchrom/pom.xml
@@ -20,7 +20,7 @@
 		<cbi-version>1.1.5</cbi-version>
 		<!-- definition of the target to use -->
 		<tycho.target.groupId>net.openchrom</tycho.target.groupId>
-		<tycho.target.artifactId>thirdpartylibraries.targetplatform</tycho.target.artifactId>
+		<tycho.target.artifactId>thirdparty.targetplatform</tycho.target.artifactId>
 		<tycho.target.version>1.0.0-SNAPSHOT</tycho.target.version>
 		<skip.install>false</skip.install>
 		<!-- other settings -->
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/.project b/openchrom/sites/net.openchrom.thirdparty.updateSite/.project
similarity index 85%
rename from openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/.project
rename to openchrom/sites/net.openchrom.thirdparty.updateSite/.project
index 346d083d..8307be25 100644
--- a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/.project
+++ b/openchrom/sites/net.openchrom.thirdparty.updateSite/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>net.openchrom.thirdpartylibraries.updateSite</name>
+	<name>net.openchrom.thirdparty.updateSite</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/.settings/org.eclipse.core.resources.prefs b/openchrom/sites/net.openchrom.thirdparty.updateSite/.settings/org.eclipse.core.resources.prefs
similarity index 100%
rename from openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/.settings/org.eclipse.core.resources.prefs
rename to openchrom/sites/net.openchrom.thirdparty.updateSite/.settings/org.eclipse.core.resources.prefs
diff --git a/openchrom/sites/net.openchrom.thirdparty.updateSite/category.xml b/openchrom/sites/net.openchrom.thirdparty.updateSite/category.xml
new file mode 100644
index 00000000..5e190bfe
--- /dev/null
+++ b/openchrom/sites/net.openchrom.thirdparty.updateSite/category.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<site>
+   <feature url="features/net.openchrom.thirdparty.cdk.feature_2.8.0.qualifier.jar" id="net.openchrom.thirdparty.cdk.feature" version="2.8.0.qualifier">
+      <category name="net.openchrom.thirdparty"/>
+   </feature>
+   <feature url="features/net.openchrom.thirdparty.jhdf5.feature_19.4.1.qualifier.jar" id="net.openchrom.thirdparty.jhdf5.feature" version="19.4.1.qualifier">
+      <category name="net.openchrom.thirdparty"/>
+   </feature>
+   <feature url="features/net.openchrom.thirdparty.mockito.feature_2.0.2.qualifier.jar" id="net.openchrom.thirdparty.mockito.feature" version="2.0.2.qualifier">
+      <category name="net.openchrom.thirdparty"/>
+   </feature>
+   <feature url="features/net.openchrom.thirdparty.eclipselink.feature_2.7.10.qualifier.jar" id="net.openchrom.thirdparty.eclipselink.feature" version="2.7.10.qualifier">
+      <category name="net.openchrom.thirdparty"/>
+   </feature>
+   <category-def name="net.openchrom.thirdparty" label="OpenChrom Third Party Libraries">
+      <description>
+         This update site provides third party libraries.
+      </description>
+   </category-def>
+</site>
\ No newline at end of file
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/index.html b/openchrom/sites/net.openchrom.thirdparty.updateSite/index.html
similarity index 97%
rename from openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/index.html
rename to openchrom/sites/net.openchrom.thirdparty.updateSite/index.html
index cbc5177b..430e0a61 100644
--- a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/index.html
+++ b/openchrom/sites/net.openchrom.thirdparty.updateSite/index.html
@@ -1,6 +1,6 @@
 <html>
 <head>
-<title>net.openchrom.thirdpartylibraries</title>
+<title>net.openchrom.thirdparty</title>
 <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 <style>@import url("web/site.css");</style>
 <script type="text/javascript">
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/pom.xml b/openchrom/sites/net.openchrom.thirdparty.updateSite/pom.xml
similarity index 89%
rename from openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/pom.xml
rename to openchrom/sites/net.openchrom.thirdparty.updateSite/pom.xml
index 8926c0f6..199e4b35 100644
--- a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/pom.xml
+++ b/openchrom/sites/net.openchrom.thirdparty.updateSite/pom.xml
@@ -8,7 +8,7 @@
 		<version>BUILD-VERSION</version>
 	</parent>
 
-	<artifactId>net.openchrom.thirdpartylibraries.updateSite</artifactId>
+	<artifactId>net.openchrom.thirdparty.updateSite</artifactId>
 	<version>1.3.0-SNAPSHOT</version>
 	<packaging>eclipse-repository</packaging>
 
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/web/site.css b/openchrom/sites/net.openchrom.thirdparty.updateSite/web/site.css
similarity index 100%
rename from openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/web/site.css
rename to openchrom/sites/net.openchrom.thirdparty.updateSite/web/site.css
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/web/site.xsl b/openchrom/sites/net.openchrom.thirdparty.updateSite/web/site.xsl
similarity index 98%
rename from openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/web/site.xsl
rename to openchrom/sites/net.openchrom.thirdparty.updateSite/web/site.xsl
index 10f2c96d..ce08a4ef 100644
--- a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/web/site.xsl
+++ b/openchrom/sites/net.openchrom.thirdparty.updateSite/web/site.xsl
@@ -5,11 +5,11 @@
 <xsl:for-each select="site">
 	<html>
 	<head>
-	<title>net.openchrom.thirdpartylibraries</title>
+	<title>net.openchrom.thirdparty</title>
 	<style>@import url("web/site.css");</style>
 	</head>
 	<body>
-	<h1 class="title">net.openchrom.thirdpartylibraries</h1>
+	<h1 class="title">net.openchrom.thirdparty</h1>
 	<p class="bodyText"><xsl:value-of select="description"/></p>
 	<table width="100%" border="0" cellspacing="1" cellpadding="2">
 	<xsl:for-each select="category-def">
diff --git a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/category.xml b/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/category.xml
deleted file mode 100644
index fb88d66e..00000000
--- a/openchrom/sites/net.openchrom.thirdpartylibraries.updateSite/category.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/net.openchrom.thirdpartylibraries.cdk.feature_2.8.0.qualifier.jar" id="net.openchrom.thirdpartylibraries.cdk.feature" version="2.8.0.qualifier">
-      <category name="net.openchrom.thirdpartylibraries"/>
-   </feature>
-   <feature url="features/net.openchrom.thirdpartylibraries.jhdf5.feature_19.4.1.qualifier.jar" id="net.openchrom.thirdpartylibraries.jhdf5.feature" version="19.4.1.qualifier">
-      <category name="net.openchrom.thirdpartylibraries"/>
-   </feature>
-   <feature url="features/net.openchrom.thirdpartylibraries.mockito.feature_2.0.2.qualifier.jar" id="net.openchrom.thirdpartylibraries.mockito.feature" version="2.0.2.qualifier">
-      <category name="net.openchrom.thirdpartylibraries"/>
-   </feature>
-   <feature url="features/net.openchrom.thirdpartylibraries.eclipselink.feature_2.7.10.qualifier.jar" id="net.openchrom.thirdpartylibraries.eclipselink.feature" version="2.7.10.qualifier">
-      <category name="net.openchrom.thirdpartylibraries"/>
-   </feature>
-   <category-def name="net.openchrom.thirdpartylibraries" label="OpenChrom Third Party Libraries">
-      <description>
-         This update site provides third party libraries.
-      </description>
-   </category-def>
-</site>
\ No newline at end of file
diff --git a/openchrom/sites/pom.xml b/openchrom/sites/pom.xml
index aeb39868..7c28c0e9 100644
--- a/openchrom/sites/pom.xml
+++ b/openchrom/sites/pom.xml
@@ -6,7 +6,7 @@
     <groupId>net.openchrom</groupId>
     <artifactId>parent</artifactId>
     <version>BUILD-VERSION</version>
-    <relativePath>../cbi/net.openchrom.thirdpartylibraries.cbi/pom.xml</relativePath>
+    <relativePath>../cbi/net.openchrom.thirdparty.cbi/pom.xml</relativePath>
   </parent>
 
   <artifactId>net.openchrom.sites.parent</artifactId>