diff --git a/.github/workflows/maven-deploy-to-java-model.yml b/.github/workflows/maven-deploy-to-java-model.yml
index 0ded417..0e52131 100644
--- a/.github/workflows/maven-deploy-to-java-model.yml
+++ b/.github/workflows/maven-deploy-to-java-model.yml
@@ -43,9 +43,9 @@ jobs:
         env:
           API_TOKEN_GITHUB: ${{ secrets.API_TOKEN_GITHUB }}
         with:
-          source_file: 'aas/src/main/java/io/adminshell/aas/v3/model'
+          source_file: 'aas/src/main/java/org/eclipse/digitaltwin/aas4j/v3/model'
           destination_repo: 'admin-shell-io/java-model'
-          destination_folder: 'src/main/java/io/adminshell/aas/v3/'
+          destination_folder: 'src/main/java/org/eclipse/digitaltwin/aas4j/v3/'
           user_email: 'sebastian.r.bader@web.de'
           user_name: 'Sebastian Bader'
           commit_message: 'This is an automated commit that was triggered by a change in the main branch of https://github.com/admin-shell-io/java-generator/'
diff --git a/.gitignore b/.gitignore
index 4a9e40f..5e61275 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.log
 */target/
 **/.flattened-pom.xml
+**/*.DS_Store
 
 .idea/
 
diff --git a/aas/pom.xml b/aas/pom.xml
index a70e1a3..3c787ba 100644
--- a/aas/pom.xml
+++ b/aas/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>common</artifactId>
-        <groupId>io.admin-shell.aas</groupId>
+        <groupId>org.eclipse.aas4j</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -13,13 +13,13 @@
 
 	<properties>
     <ontology.title>Asset Administration Shell</ontology.title>
-		<ontology.namespace>https://admin-shell.io/aas/3/0/RC01/</ontology.namespace>
+		<ontology.namespace>https://admin-shell.io/aas/3/1/</ontology.namespace>
 		<ontology.namespace.prefix>aas</ontology.namespace.prefix>
 	</properties>
 
 	<dependencies>
         <dependency>
-            <groupId>io.admin-shell.aas</groupId>
+            <groupId>org.eclipse.aas4j</groupId>
             <artifactId>util</artifactId>
             <version>${revision}</version>
         </dependency>
@@ -35,7 +35,7 @@
             <version>${jackson.version}</version>
         </dependency>
         <dependency>
-            <groupId>io.admin-shell.aas</groupId>
+            <groupId>org.eclipse.aas4j</groupId>
             <artifactId>generator</artifactId>
             <version>${revision}</version>
             <optional>true</optional>
@@ -152,7 +152,7 @@
                 <configuration>
                     <filesets>
                         <fileset>
-                            <directory>${basedir}/src/main/java/io/adminshell</directory>
+                            <directory>${basedir}/src/main/java/org/eclipse</directory>
                             <includes>
                                 <include>**/*.java</include>
                             </includes>
@@ -262,9 +262,9 @@
                         <phase>initialize</phase>
                         <configuration>
                             <target>
-                                <mkdir dir="${tmp-path}/io/adminshell/aas/v3/model/impl"/>
-                                <mkdir dir="${tmp-path}/io/adminshell/aas/v3/model/builder"/>
-                                <mkdir dir="${tmp-path}/io/adminshell/aas/v3/model/annotations"/>
+                                <mkdir dir="${tmp-path}/org/eclipse/digitaltwin/aas4j/v3/model/impl"/>
+                                <mkdir dir="${tmp-path}/org/eclipse/digitaltwin/aas4j/v3/model/builder"/>
+                                <mkdir dir="${tmp-path}/org/eclipse/digitaltwin/aas4j/v3/model/annotations"/>
                             </target>
                         </configuration>
                         <goals>
diff --git a/aas/src/templates/basic-imports.rq b/aas/src/templates/basic-imports.rq
index 2f05153..aba122e 100644
--- a/aas/src/templates/basic-imports.rq
+++ b/aas/src/templates/basic-imports.rq
@@ -20,12 +20,12 @@ prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>
 template idstt:basic-imports {
 
     #"\nimport de.fraunhofer.iais.eis.util.*;"
-    "\nimport io.adminshell.aas.v3.model.*;"
-    "\nimport io.adminshell.aas.v3.model.impl.*;"
-    #"\nimport io.adminshell.aas.v3.dataformat.json.mixins.*;"
-    "\nimport io.adminshell.aas.v3.model.builder.*;"
-    "\nimport io.adminshell.aas.v3.model.annotations.IRI;"
-    "\nimport io.adminshell.aas.v3.model.annotations.KnownSubtypes;"
+    "\nimport org.eclipse.digitaltwin.aas4j.v3.model.*;"
+    "\nimport org.eclipse.digitaltwin.aas4j.v3.model.impl.*;"
+    #"\nimport org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins.*;"
+    "\nimport org.eclipse.digitaltwin.aas4j.v3.model.builder.*;"
+    "\nimport org.eclipse.digitaltwin.aas4j.v3.model.annotations.IRI;"
+    "\nimport org.eclipse.digitaltwin.aas4j.v3.model.annotations.KnownSubtypes;"
     #"\nimport de.fraunhofer.iais.eis.*;"
     "\n"
     "\nimport javax.xml.datatype.XMLGregorianCalendar;"
diff --git a/aas/src/templates/get-package.rq b/aas/src/templates/get-package.rq
index 94b0e20..d6b642f 100644
--- a/aas/src/templates/get-package.rq
+++ b/aas/src/templates/get-package.rq
@@ -18,14 +18,14 @@ prefix idstt: <https://w3id.org/idsa/transformationtemplates/>
 
 template idstt:get-package (?type) {
     "package "
-    if(str(?type) = 'interface', "io.adminshell.aas.v3.model",
-    if(str(?type) = 'bean', "io.adminshell.aas.v3.model.impl",
-    if(str(?type) = 'mixin', "io.adminshell.aas.v3.dataformat.json.mixins",
-    if(str(?type) = 'builder', "io.adminshell.aas.v3.model.builder",
-    if(str(?type) = 'serialization', "io.adminshell.aas.v3.dataformat",
-    if(str(?type) = 'enum', "io.adminshell.aas.v3.model",
-    if(str(?type) = 'annotations', "io.adminshell.aas.v3.model.annotations",
-    "io.adminshell.aas.v3.model" #default
+    if(str(?type) = 'interface', "org.eclipse.digitaltwin.aas4j.v3.model",
+    if(str(?type) = 'bean', "org.eclipse.digitaltwin.aas4j.v3.model.impl",
+    if(str(?type) = 'mixin', "org.eclipse.digitaltwin.aas4j.v3.dataformat.json.mixins",
+    if(str(?type) = 'builder', "org.eclipse.digitaltwin.aas4j.v3.model.builder",
+    if(str(?type) = 'serialization', "org.eclipse.digitaltwin.aas4j.v3.dataformat",
+    if(str(?type) = 'enum', "org.eclipse.digitaltwin.aas4j.v3.model",
+    if(str(?type) = 'annotations', "org.eclipse.digitaltwin.aas4j.v3.model.annotations",
+    "org.eclipse.digitaltwin.aas4j.v3.model" #default
     )))))))
     ";\n"
 
diff --git a/generator/pom.xml b/generator/pom.xml
index 85651b9..d23678f 100644
--- a/generator/pom.xml
+++ b/generator/pom.xml
@@ -4,7 +4,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>common</artifactId>
-        <groupId>io.admin-shell.aas</groupId>
+        <groupId>org.eclipse.aas4j</groupId>
         <version>${revision}</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
@@ -21,7 +21,7 @@
         <dependency>
             <groupId>fr.inria.wimmics</groupId>
             <artifactId>kgtool</artifactId>
-            <version>3.2.1</version>
+            <version>3.2.0</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jws</artifactId>
@@ -38,8 +38,8 @@
                 <artifactId>maven-compiler-plugin</artifactId>
                 <version>3.11.0</version>
                 <configuration>
-                    <source>1.8</source>
-                    <target>1.8</target>
+                    <source>7</source>
+                    <target>7</target>
                 </configuration>
             </plugin>
 
diff --git a/pom.xml b/pom.xml
index b870754..d30fa2a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,43 +15,43 @@
     <url>https://github.com/eclipse-digitaltwin/aas4j-model-generator</url>
     <inceptionYear>2021</inceptionYear>
     <organization>
-      <name>Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS</name>
-      <url>https://www.iais.fraunhofer.de/</url>
+        <name>Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS</name>
+        <url>https://www.iais.fraunhofer.de/</url>
     </organization>
     <licenses>
-      <license>
-        <name>Apache License, Version 2.0</name>
-        <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
-        <distribution>repo</distribution>
-      </license>
+        <license>
+            <name>Apache License, Version 2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+            <distribution>repo</distribution>
+        </license>
     </licenses>
 
-	<developers>
-		<developer>
-			<name>Sebastian Bader</name>
-			<email>s.bader@sap.com</email>
-			<organization>SAP SE</organization>
-			<organizationUrl>https://www.sap.com/</organizationUrl>
-			<roles>
-				<role>lead</role>
-				<role>developer</role>
-			</roles>
-		</developer>
-		<developer>
-			<name>Matthias Böckmann</name>
-			<email>matthias.boeckmann@iais.fraunhofer.de</email>
-			<organization>Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS</organization>
-			<organizationUrl>https://www.iais.fraunhofer.de/</organizationUrl>
-			<roles>
-				<role>developer</role>
-			</roles>
-		</developer>
-	</developers>
-
-	<issueManagement>
-		<system>Github</system>
-		<url>https://github.com/eclipse-digitaltwin/aas4j-model-generator/issues</url>
-	</issueManagement>
+    <developers>
+        <developer>
+            <name>Sebastian Bader</name>
+            <email>s.bader@sap.com</email>
+            <organization>SAP SE</organization>
+            <organizationUrl>https://www.sap.com/</organizationUrl>
+            <roles>
+                <role>lead</role>
+                <role>developer</role>
+            </roles>
+        </developer>
+        <developer>
+            <name>Matthias Böckmann</name>
+            <email>matthias.boeckmann@iais.fraunhofer.de</email>
+            <organization>Fraunhofer Institute for Intelligent Analysis and Information Systems IAIS</organization>
+            <organizationUrl>https://www.iais.fraunhofer.de/</organizationUrl>
+            <roles>
+                <role>developer</role>
+            </roles>
+        </developer>
+    </developers>
+
+    <issueManagement>
+        <system>Github</system>
+        <url>https://github.com/eclipse-digitaltwin/aas4j-model-generator/issues</url>
+    </issueManagement>
 
     <modules>
         <module>util</module>
@@ -59,21 +59,21 @@
         <module>aas</module>
     </modules>
     <properties>
-  		  <!-- General -->
+        <!-- General -->
         <revision>1.2.0</revision>
         <jackson.version>2.11.2</jackson.version>
         <!--<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>-->
-    		<email>contact@ids.fraunhofer.de</email>
+        <email>contact@ids.fraunhofer.de</email>
 
-    		<!-- Build info -->
-    		<java.version>11</java.version>
-    		<maven.compiler.release>${java.version}</maven.compiler.release>
-    		<maven.minimum.version>3.3.9</maven.minimum.version>
+        <!-- Build info -->
+        <java.version>11</java.version>
+        <maven.compiler.release>${java.version}</maven.compiler.release>
+        <maven.minimum.version>3.3.9</maven.minimum.version>
 
         <gpg.keyname>0xDFCC34A6</gpg.keyname>
         <plugin.license.version>4.2</plugin.license.version>
         <plugin.gpg.version>3.1.0</plugin.gpg.version>
-  	</properties>
+    </properties>
 
     <profiles>
         <profile>
@@ -146,26 +146,26 @@
     </profiles>
 
 
-<!--    <distributionManagement>
-        <repository>
-            <id>eis-release-repo</id>
-            <name>maven-releases</name>
-            <url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-release</url>
-        </repository>
-        <snapshotRepository>
-            <id>eis-snapshot-repo</id>
-            <name>maven-snapshots</name>
-            <url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-snapshot</url>
-        </snapshotRepository>
-    </distributionManagement>
-
-    <repositories>
-        <repository>
-            <id>eis-snapshot-repo</id>
-            <name>maven-snapshots</name>
-            <url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-snapshot</url>
-        </repository>
-    </repositories>-->
+    <!--    <distributionManagement>
+            <repository>
+                <id>eis-release-repo</id>
+                <name>maven-releases</name>
+                <url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-release</url>
+            </repository>
+            <snapshotRepository>
+                <id>eis-snapshot-repo</id>
+                <name>maven-snapshots</name>
+                <url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-snapshot</url>
+            </snapshotRepository>
+        </distributionManagement>
+
+        <repositories>
+            <repository>
+                <id>eis-snapshot-repo</id>
+                <name>maven-snapshots</name>
+                <url>http://maven.iais.fraunhofer.de/artifactory/eis-ids-snapshot</url>
+            </repository>
+        </repositories>-->
 
     <build>
         <plugins>
@@ -176,8 +176,8 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>3.5.0</version>
                 <configuration>
-                  <source>8</source>
-                  <detectJavaApiLink>false</detectJavaApiLink>
+                    <source>8</source>
+                    <detectJavaApiLink>false</detectJavaApiLink>
                 </configuration>
                 <executions>
                     <execution>
diff --git a/util/pom.xml b/util/pom.xml
index 7b515cb..2d25b12 100644
--- a/util/pom.xml
+++ b/util/pom.xml
@@ -3,7 +3,7 @@
          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">
     <parent>
-        <groupId>io.admin-shell.aas</groupId>
+        <groupId>org.eclipse.aas4j</groupId>
         <artifactId>common</artifactId>
         <version>${revision}</version>
     </parent>