diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 6d360ee32822b285f2f2329c4e7a35d461940b96..dc42be8da62cf70a936d8f43bcf10c6c0228fafa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ pages:
     - mvn p2:site   # build p2 repo
     - rm -rf $RELEASE_DIR
     - mkdir -p $RELEASE_DIR
-    - cp -r de.hft-stuttgart.indriya.p2site/target/repository/* $RELEASE_DIR
+    - cp -r target/repository/* $RELEASE_DIR
   artifacts:
     paths:
       - public
diff --git a/de.hft-stuttgart.indriya.feature/build.properties b/de.hft-stuttgart.indriya.feature/build.properties
deleted file mode 100644
index 64f93a9f0b7328eb563aa5ad6cec7f828020e124..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.feature/build.properties
+++ /dev/null
@@ -1 +0,0 @@
-bin.includes = feature.xml
diff --git a/de.hft-stuttgart.indriya.feature/feature.xml b/de.hft-stuttgart.indriya.feature/feature.xml
deleted file mode 100644
index 89fb1da26d9ae561aa21a018aa392ae95a6deb3d..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.feature/feature.xml
+++ /dev/null
@@ -1,63 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<feature
-      id="de.hft-stuttgart.indriya.feature"
-      label="Indriya P2"
-      version="1.0.0"
-      provider-name="HfT Stuttgart">
-
-   <description url="http://www.example.com/description">
-      Provides Indriya reference implementation of units of masurement (JSR 385) as P2 repository.
-   </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>
-
-   <requires>
-      <import plugin="org.eclipse.core.runtime" version="3.8.0" match="compatible"/>
-      <import plugin="tech.units.indriya" version="2.1.1" match="compatible"/>
-      <import plugin="javax.measure.unit-api" version="0.0.0" match="compatible"/>
-      <import plugin="uom-lib-common" version="0.0.0" match="compatible"/>
-      <import plugin="javax.inject"/>
-   </requires>
-
-   <plugin
-         id="tech.units.indriya"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="uom-lib-common"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jakarta.annotation-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="jakarta.inject.jakarta.inject-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-   <plugin
-         id="javax.measure.unit-api"
-         download-size="0"
-         install-size="0"
-         version="0.0.0"
-         unpack="false"/>
-
-</feature>
diff --git a/de.hft-stuttgart.indriya.feature/pom.xml b/de.hft-stuttgart.indriya.feature/pom.xml
deleted file mode 100644
index 1d1064b2f17886d8d54c53c0bdc1141d8f6b27eb..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.feature/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>de.hft-stuttgart.indriya.feature</artifactId>
-	<packaging>eclipse-feature</packaging>
-	<name>Indriya P2 site feature</name>
-	<parent>
-		<groupId>de.hft-stuttgart</groupId>
-  		<artifactId>de.hft-stuttgart.indriya.parent</artifactId>
-  		<version>1.0.0</version>
-  	</parent>
-</project>
\ No newline at end of file
diff --git a/de.hft-stuttgart.indriya.p2site/category.xml b/de.hft-stuttgart.indriya.p2site/category.xml
deleted file mode 100644
index 8f8db1e6e10a454e8b18b9bcaf0c869a0ad5f54a..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.p2site/category.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature id="de.hft-stuttgart.indriya.feature">
-      <category name="Indriya"/>
-   </feature>
-   <category-def name="indriya" label="Indriya">
-      <description>
-         Provides Indriya reference implementation of units of masurement (JSR 385) as P2 repository.
-      </description>
-   </category-def>
-</site>
diff --git a/de.hft-stuttgart.indriya.p2site/pom.xml b/de.hft-stuttgart.indriya.p2site/pom.xml
deleted file mode 100644
index 456ebd9628568ee7dd73a48a634e52e623d07414..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.p2site/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>de.hft-stuttgart.indriya.p2site</artifactId>
-	<packaging>eclipse-repository</packaging>
-	<name>Indriya P2 site generation</name>
-	<parent>
-		<groupId>de.hft-stuttgart</groupId>
-		<artifactId>de.hft-stuttgart.indriya.parent</artifactId>
-		<version>1.0.0</version>
-	</parent>
-</project>
\ No newline at end of file
diff --git a/de.hft-stuttgart.indriya.p2site/site.xml b/de.hft-stuttgart.indriya.p2site/site.xml
deleted file mode 100644
index f0fee37316059fc2172cf587cf6ed424c4cd1398..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.p2site/site.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<site>
-   <feature url="features/de.hft-stuttgart.indriya.feature_1.0.0.jar" id="de.hft-stuttgart.indriya.feature" version="1.0.0">
-      <category name="indriya"/>
-   </feature>
-   <category-def name="indriya" label="Indriya">
-      <description>
-         Provides Indriya reference implementation of units of masurement (JSR 385) as P2 repository.
-      </description>
-   </category-def>
-</site>
diff --git a/de.hft-stuttgart.indriya.target/de.hft-stuttgart.indriya.target.target b/de.hft-stuttgart.indriya.target/de.hft-stuttgart.indriya.target.target
deleted file mode 100644
index b5a1165a05068ff774ac15b1b38dbf5291d18633..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.target/de.hft-stuttgart.indriya.target.target
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?pde version="3.8"?>
-<target name="Equinox Runtime 2020-09">
-	<locations>
-		<location includeAllPlatforms="false" includeConfigurePhase="false" includeMode="planner" includeSource="false" type="InstallableUnit">
-			<repository location="http://download.eclipse.org/releases/2020-09"/>
-			<unit id="org.eclipse.equinox.sdk.feature.group" version="3.20.300.v20200828-1034"/>
-		</location>
-	</locations>
-</target>
\ No newline at end of file
diff --git a/de.hft-stuttgart.indriya.target/pom.xml b/de.hft-stuttgart.indriya.target/pom.xml
deleted file mode 100644
index 7e5c7b8af0115c14f954dbd7e4114a43bce73bfa..0000000000000000000000000000000000000000
--- a/de.hft-stuttgart.indriya.target/pom.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<artifactId>de.hft-stuttgart.indriya.target</artifactId>
-	<packaging>eclipse-target-definition</packaging>
-	<name>Indriya P2 site target definition</name>
-	<parent>
-		<groupId>de.hft-stuttgart</groupId>
-  		<artifactId>de.hft-stuttgart.indriya.parent</artifactId>
-  		<version>1.0.0</version>
-  	</parent>
-</project>
\ No newline at end of file