diff --git a/.reuse/dep5 b/.reuse/dep5
deleted file mode 100644
index 3b5c4221..00000000
--- a/.reuse/dep5
+++ /dev/null
@@ -1,12 +0,0 @@
-Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: osc-sdk-java
-Upstream-Contact: Outscale support <support@outscale.com>
-Source: https://github.com/outscale/osc-sdk-java/
-
-Files: *.md *.md.template
-Copyright: 2019 Outscale SAS <support@outscale.com>
-License: CC-BY-4.0
-
-Files: Makefile sdk_version api_version *.java .git* src/* dist/* *.yml *.yaml .osc-patches/*.patch  .osc-api-patches/*.patch examples/* pom.xml pom.xml.template templates/*
-Copyright: 2019 Outscale SAS <support@outscale.com>
-License: BSD-3-Clause
diff --git a/Makefile b/Makefile
index bd52eccb..fc14d74a 100644
--- a/Makefile
+++ b/Makefile
@@ -31,7 +31,7 @@ build:
 .PHONY: reuse-test
 reuse-test:
 	@echo testing licensing with reuse...
-	docker run --rm --volume $(PWD):/data fsfe/reuse:0.11.1 lint
+	docker run --rm --volume $(PWD):/data fsfe/reuse:6.2 lint
 
 .PHONY: examples-test
 examples-test: example-volumes example-region example-vm example-config_file example-config_env example-password_auth
diff --git a/REUSE.toml b/REUSE.toml
new file mode 100644
index 00000000..c3ef94a1
--- /dev/null
+++ b/REUSE.toml
@@ -0,0 +1,16 @@
+version = 1
+SPDX-PackageName = "osc-sdk-java"
+SPDX-PackageSupplier = "Outscale support <support@outscale.com>"
+SPDX-PackageDownloadLocation = "https://github.com/outscale/osc-sdk-java/"
+
+[[annotations]]
+path = ["**.md", "**.md.template"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2019 Outscale SAS <support@outscale.com>"
+SPDX-License-Identifier = "CC-BY-4.0"
+
+[[annotations]]
+path = ["Makefile", "sdk_version", "api_version", "**.java", ".git**", "src/**", "dist/**", "**.yml", "**.yaml", "examples/**", "pom.xml", "pom.xml.template", "sdk/**", "bundle/**" ,"sbom/**"]
+precedence = "aggregate"
+SPDX-FileCopyrightText = "2019 Outscale SAS <support@outscale.com>"
+SPDX-License-Identifier = "BSD-3-Clause"
diff --git a/bundle/pom.xml b/bundle/pom.xml
new file mode 100644
index 00000000..de9480d5
--- /dev/null
+++ b/bundle/pom.xml
@@ -0,0 +1,115 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>io.github.outscale</groupId>
+    <artifactId>osc-sdk-java-parent</artifactId>
+    <version>0.8.0</version>
+  </parent>
+
+  <artifactId>osc-sdk-java-bundle</artifactId>
+  <packaging>jar</packaging>
+  <name>osc-sdk-java Bundle (uber-jar)</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>io.github.outscale</groupId>
+      <artifactId>osc-sdk-java</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-shade-plugin</artifactId>
+        <version>3.6.1</version>
+        <configuration>
+          <relocations>
+            <relocation>
+              <pattern>com.squareup.okhttp3</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.com.squareup.okhttp3</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>com.google.code.gson</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.com.google.code.gson</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>io.gsonfire</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.io.gsonfire</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.apache</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.apache</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>jakarta</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.jakarta</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.openapitools</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.openapitools</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>javax.ws.rs</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.javax.ws.rs</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>javax.annotation</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.javax.annotation</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>software.amazon.awssdk.auth</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.software.amazon.awssdk.auth</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>dev.failsafe</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.dev.failsae</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.junit</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.junit</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.mockito</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.mockito</shadedPattern>
+            </relocation>
+            <relocation>
+              <pattern>org.bouncycastle</pattern>
+              <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.bouncycastle</shadedPattern>
+            </relocation>
+          </relocations>
+          <filters>
+            <filter>
+              <artifact>*:*</artifact>
+              <excludes>
+                <exclude>META-INF/*.SF</exclude>
+                <exclude>META-INF/*.DSA</exclude>
+                <exclude>META-INF/*.RSA</exclude>
+                <exclude>META-INF/NOTICE.txt</exclude>
+                <exclude>META-INF/NOTICE</exclude>
+                <exclude>META-INF/LICENSE</exclude>
+                <exclude>META-INF/LICENSE.txt</exclude>
+                <exclude>META-INF/FastDoubleParser-LICENSE</exclude>
+                <exclude>META-INF/FastDoubleParser-NOTICE</exclude>
+                <exclude>module-info.class</exclude>
+                <exclude>META-INF/versions/*/module-info.class</exclude>
+              </excludes>
+            </filter>
+          </filters>
+        </configuration>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <goals>
+              <goal>shade</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>
diff --git a/pom.xml b/pom.xml
index 862c5875..fc653b49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,8 +2,8 @@
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
 <modelVersion>4.0.0</modelVersion>
 <groupId>io.github.outscale</groupId>
-<artifactId>osc-sdk-java</artifactId>
-<packaging>jar</packaging>
+<artifactId>osc-sdk-java-parent</artifactId>
+<packaging>pom</packaging>
 <name>osc-sdk-java</name>
 <version>0.8.0</version>
 <url>https://github.com/outscale/osc-sdk-java</url>
@@ -42,354 +42,11 @@
     </repository>
 </distributionManagement>
 
-<build>
-    <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.10.1</version>
-            <configuration>
-                <fork>true</fork>
-                <meminitial>128m</meminitial>
-                <maxmem>512m</maxmem>
-                <compilerArgs>
-                    <arg>-Xlint:all</arg>
-                    <arg>-J-Xss4m</arg><!-- Compiling the generated JSON.java file may require larger stack size. -->
-                </compilerArgs>
-            </configuration>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-enforcer-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-                <execution>
-                    <id>enforce-maven</id>
-                    <goals>
-                        <goal>enforce</goal>
-                    </goals>
-                    <configuration>
-                        <rules>
-                            <requireMavenVersion>
-                                <version>2.2.0</version>
-                            </requireMavenVersion>
-                        </rules>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-surefire-plugin</artifactId>
-            <version>3.5.4</version>
-            <configuration>
-                <systemProperties>
-                    <property>
-                        <name>loggerPath</name>
-                        <value>conf/log4j.properties</value>
-                    </property>
-                </systemProperties>
-                <argLine>-Xms512m -Xmx1500m</argLine>
-                <parallel>methods</parallel>
-                <threadCount>10</threadCount>
-            </configuration>
-            <dependencies>
-                <!--Custom provider and engine for Junit 5 to surefire-->
-                <dependency>
-                    <groupId>org.junit.jupiter</groupId>
-                    <artifactId>junit-jupiter-engine</artifactId>
-                    <version>${junit-version}</version>
-                </dependency>
-            </dependencies>
-        </plugin>
-        <plugin>
-            <artifactId>maven-dependency-plugin</artifactId>
-            <version>3.5.0</version>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>copy-dependencies</goal>
-                    </goals>
-                    <configuration>
-                        <outputDirectory>${project.build.directory}/lib</outputDirectory>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <!-- attach test jar -->
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-jar-plugin</artifactId>
-            <version>3.3.0</version>
-            <executions>
-                <execution>
-                    <goals>
-                        <goal>test-jar</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-            </configuration>
-        </plugin>
-        <plugin>
-            <groupId>org.codehaus.mojo</groupId>
-            <artifactId>build-helper-maven-plugin</artifactId>
-            <version>3.6.1</version>
-            <executions>
-                <execution>
-                    <id>add_sources</id>
-                    <phase>generate-sources</phase>
-                    <goals>
-                        <goal>add-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <source>src/main/java</source>
-                        </sources>
-                    </configuration>
-                </execution>
-                <execution>
-                    <id>add_test_sources</id>
-                    <phase>generate-test-sources</phase>
-                    <goals>
-                        <goal>add-test-source</goal>
-                    </goals>
-                    <configuration>
-                        <sources>
-                            <source>src/test/java</source>
-                        </sources>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <version>3.4.1</version>
-            <executions>
-                <execution>
-                    <id>attach-javadocs</id>
-                    <goals>
-                        <goal>jar</goal>
-                    </goals>
-                </execution>
-            </executions>
-            <configuration>
-                <doclint>none</doclint>
-                <tags>
-                    <tag>
-                        <name>http.response.details</name>
-                        <placement>a</placement>
-                        <head>Http Response Details:</head>
-                    </tag>
-                </tags>
-            </configuration>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-source-plugin</artifactId>
-            <version>3.2.1</version>
-            <executions>
-                <execution>
-                    <id>attach-sources</id>
-                    <goals>
-                        <goal>jar-no-fork</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-        <!-- Use spotless plugin to automatically format code, remove unused import, etc
-            To apply changes directly to the file, run `mvn spotless:apply`
-            Ref: https://github.com/diffplug/spotless/tree/main/plugin-maven
-        -->
-        <plugin>
-            <groupId>com.diffplug.spotless</groupId>
-            <artifactId>spotless-maven-plugin</artifactId>
-            <version>${spotless.version}</version>
-            <configuration>
-                <formats>
-                    <!-- you can define as many formats as you want, each is independent -->
-                    <format>
-                        <!-- define the files to apply to -->
-                        <includes>
-                            <include>.gitignore</include>
-                        </includes>
-                        <!-- define the steps to apply to those files -->
-                        <trimTrailingWhitespace/>
-                        <endWithNewline/>
-                        <indent>
-                            <spaces>true</spaces> <!-- or <tabs>true</tabs> -->
-                            <spacesPerTab>4</spacesPerTab> <!-- optional, default is 4 -->
-                        </indent>
-                    </format>
-                </formats>
-                <!-- define a language-specific format -->
-                <java>
-                    <!-- no need to specify files, inferred automatically, but you can if you want -->
-
-                    <!-- apply a specific flavor of google-java-format and reflow long strings -->
-                    <googleJavaFormat>
-                        <version>1.8</version>
-                        <style>AOSP</style>
-                        <reflowLongStrings>true</reflowLongStrings>
-                    </googleJavaFormat>
-
-                    <removeUnusedImports/>
-                    <importOrder/>
-
-                </java>
-            </configuration>
-        </plugin>
-        <!--  This plugin is for required to dploy to nexus
-        https://central.sonatype.org/publish/publish-maven/#distribution-management-and-authentication -->
-        <plugin>
-            <groupId>org.sonatype.plugins</groupId>
-            <artifactId>nexus-staging-maven-plugin</artifactId>
-            <version>1.6.7</version>
-            <extensions>true</extensions>
-            <configuration>
-                <serverId>ossrh</serverId>
-                <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
-                <autoReleaseAfterClose>true</autoReleaseAfterClose>
-            </configuration>
-        </plugin>
-
-        <!-- use -Dgpg.skip to disable gpg signature -->
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-gpg-plugin</artifactId>
-            <version>3.0.1</version>
-            <executions>
-                <execution>
-                    <id>sign-artifacts</id>
-                    <phase>verify</phase>
-                    <goals>
-                        <goal>sign</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.openapitools</groupId>
-            <artifactId>openapi-generator-maven-plugin</artifactId>
-            <version>7.15.0</version>
-            <executions>
-                <execution>
-                    <goals>
-                        <goal>generate</goal>
-                    </goals>
-                    <configuration>
-                        <gitHost>github.com</gitHost>
-                        <gitUserId>outscale</gitUserId>
-                        <gitRepoId>osc-sdk-java</gitRepoId>
-                        <inputSpec>https://raw.githubusercontent.com/outscale/osc-api-deploy/refs/tags/v${outscale-api-version}/outscale.yaml</inputSpec>
-                        <generatorName>java</generatorName>
-                        <templateDirectory>templates</templateDirectory>
-                        <groupId>io.github.outscale</groupId>
-                        <artifactId>osc-sdk-java</artifactId>		    
-                        <configOptions>
-                            <sourceFolder>src/gen/java/main</sourceFolder>
-                            <hideGenerationTimestamp>true</hideGenerationTimestamp>
-                            <withAWSV4Signature>true</withAWSV4Signature>
-                        </configOptions>
-                        <packageName>io.github.outscale.osc_sdk_java</packageName>
-                        <apiPackage>io.github.outscale.osc_sdk_java.client.handler</apiPackage>
-                        <modelPackage>io.github.outscale.osc_sdk_java.client.model</modelPackage>
-                        <invokerPackage>io.github.outscale.osc_sdk_java.client</invokerPackage>
-                    </configuration>
-                </execution>
-            </executions>
-        </plugin>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-shade-plugin</artifactId>
-            <version>3.6.1</version>
-            <configuration>
-                <relocations>
-                    <relocation>
-                        <pattern>com.squareup.okhttp3</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.com.squareup.okhttp3</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>com.google.code.gson</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.com.google.code.gson</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>io.gsonfire</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.io.gsonfire</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>org.apache</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.apache</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>jakarta</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.jakarta</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>org.openapitools</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.openapitools</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>javax.ws.rs</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.javax.ws.rs</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>javax.annotation</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.javax.annotation</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>software.amazon.awssdk.auth</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.software.amazon.awssdk.auth</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>dev.failsafe</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.dev.failsae</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>org.junit</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.junit</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>org.mockito</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.mockito</shadedPattern>
-                    </relocation>
-                    <relocation>
-                        <pattern>org.bouncycastle</pattern>
-                        <shadedPattern>io.github.outscale.osc-sdk-java.thirdparty.org.bouncycastle</shadedPattern>
-                    </relocation>
-                </relocations>
-                <filters>
-                    <filter>
-                        <artifact>*:*</artifact>
-                        <excludes>
-                            <exclude>META-INF/*.SF</exclude>
-                            <exclude>META-INF/*.DSA</exclude>
-                            <exclude>META-INF/*.RSA</exclude>
-                            <exclude>META-INF/NOTICE.txt</exclude>
-                            <exclude>META-INF/NOTICE</exclude>
-                            <exclude>META-INF/LICENSE</exclude>
-                            <exclude>META-INF/LICENSE.txt</exclude>
-                            <exclude>META-INF/FastDoubleParser-LICENSE</exclude>
-                            <exclude>META-INF/FastDoubleParser-NOTICE</exclude>
-                            <exclude>module-info.class</exclude>
-                            <exclude>META-INF/versions/*/module-info.class</exclude>
-                        </excludes>
-                    </filter>
-                </filters>
-            </configuration>
-            <executions>
-                <execution>
-                    <phase>package</phase>
-                    <goals>
-                        <goal>shade</goal>
-                    </goals>
-                </execution>
-            </executions>
-        </plugin>
-    </plugins>
-</build>
+<modules>
+    <module>sbom</module>
+    <module>sdk</module>
+    <module>bundle</module>
+</modules>
 
 <profiles>
     <profile>
@@ -415,106 +72,6 @@
     </profile>
 </profiles>
 
-<dependencies>  
-    <!-- @Nullable annotation -->
-    <dependency>
-        <groupId>com.google.code.findbugs</groupId>
-        <artifactId>jsr305</artifactId>
-        <version>3.0.2</version>
-    </dependency>
-    <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp</artifactId>
-        <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>logging-interceptor</artifactId>
-        <version>${okhttp-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>${gson-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>io.gsonfire</groupId>
-        <artifactId>gson-fire</artifactId>
-        <version>${gson-fire-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.commons</groupId>
-        <artifactId>commons-lang3</artifactId>
-        <version>${commons-lang3-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>jakarta.annotation</groupId>
-        <artifactId>jakarta.annotation-api</artifactId>
-        <version>${jakarta-annotation-version}</version>
-        <scope>provided</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.openapitools</groupId>
-        <artifactId>jackson-databind-nullable</artifactId>
-        <version>${jackson-databind-nullable-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.annotation</groupId>
-        <artifactId>javax.annotation-api</artifactId>
-        <version>1.3.2</version>
-    </dependency>
-    <dependency>
-        <groupId>software.amazon.awssdk</groupId>
-        <artifactId>auth</artifactId>
-        <version>2.39.2</version>
-    </dependency>
-    <dependency>
-        <groupId>javax.ws.rs</groupId>
-        <artifactId>javax.ws.rs-api</artifactId>
-        <version>${javax.ws.rs-api-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>dev.failsafe</groupId>
-        <artifactId>failsafe</artifactId>
-        <version>${failsafe-version}</version>
-    </dependency>
-    <dependency>
-        <groupId>dev.failsafe</groupId>
-        <artifactId>failsafe-okhttp</artifactId>
-        <version>${failsafe-version}</version>
-    </dependency>
-    <!-- test dependencies -->
-    <dependency>
-        <groupId>org.junit.jupiter</groupId>
-        <artifactId>junit-jupiter-engine</artifactId>
-        <version>${junit-version}</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.junit.platform</groupId>
-        <artifactId>junit-platform-runner</artifactId>
-        <version>${junit-platform-runner.version}</version>
-        <scope>test</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.mockito</groupId>
-        <artifactId>mockito-core</artifactId>
-        <version>${mockito-core-version}</version>
-        <scope>test</scope>
-    </dependency>
-    <!-- TLS -->
-    <dependency>
-        <groupId>org.bouncycastle</groupId>
-        <artifactId>bcpkix-jdk15on</artifactId>
-        <version>1.70</version>
-    </dependency>
-    <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp-tls -->
-    <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>okhttp-tls</artifactId>
-        <version>4.10.0</version>
-    </dependency>
-</dependencies>
 <properties>
     <java.version>1.8</java.version>
     <maven.compiler.source>${java.version}</maven.compiler.source>
diff --git a/sbom/pom.xml b/sbom/pom.xml
new file mode 100644
index 00000000..82f12d71
--- /dev/null
+++ b/sbom/pom.xml
@@ -0,0 +1,119 @@
+<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/maven-v4_0_0.xsd">
+<modelVersion>4.0.0</modelVersion>
+
+<parent>
+    <groupId>io.github.outscale</groupId>
+    <artifactId>osc-sdk-java-parent</artifactId>
+    <version>0.8.0</version>
+</parent>
+
+<artifactId>osc-sdk-java-sbom</artifactId>
+<packaging>pom</packaging>
+<name>osc-sdk-java SBOM</name>
+
+<dependencyManagement>
+    <dependencies>
+        <!-- @Nullable annotation -->
+        <dependency>
+            <groupId>com.google.code.findbugs</groupId>
+            <artifactId>jsr305</artifactId>
+            <version>3.0.2</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>logging-interceptor</artifactId>
+            <version>${okhttp-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>com.google.code.gson</groupId>
+            <artifactId>gson</artifactId>
+            <version>${gson-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>io.gsonfire</groupId>
+            <artifactId>gson-fire</artifactId>
+            <version>${gson-fire-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-lang3</artifactId>
+            <version>${commons-lang3-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>jakarta.annotation</groupId>
+            <artifactId>jakarta.annotation-api</artifactId>
+            <version>${jakarta-annotation-version}</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.openapitools</groupId>
+            <artifactId>jackson-databind-nullable</artifactId>
+            <version>${jackson-databind-nullable-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>javax.annotation-api</artifactId>
+            <version>1.3.2</version>
+        </dependency>
+        <dependency>
+            <groupId>software.amazon.awssdk</groupId>
+            <artifactId>auth</artifactId>
+            <version>2.20.157</version>
+        </dependency>
+        <dependency>
+            <groupId>javax.ws.rs</groupId>
+            <artifactId>javax.ws.rs-api</artifactId>
+            <version>${javax.ws.rs-api-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe</artifactId>
+            <version>${failsafe-version}</version>
+        </dependency>
+        <dependency>
+            <groupId>dev.failsafe</groupId>
+            <artifactId>failsafe-okhttp</artifactId>
+            <version>${failsafe-version}</version>
+        </dependency>
+        <!-- test dependencies -->
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-engine</artifactId>
+            <version>${junit-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.junit.platform</groupId>
+            <artifactId>junit-platform-runner</artifactId>
+            <version>${junit-platform-runner.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-core</artifactId>
+            <version>${mockito-core-version}</version>
+            <scope>test</scope>
+        </dependency>
+        <!-- TLS -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcpkix-jdk15on</artifactId>
+            <version>1.70</version>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/okhttp-tls -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp-tls</artifactId>
+            <version>4.10.0</version>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+
+</project>
diff --git a/sdk/pom.xml b/sdk/pom.xml
new file mode 100644
index 00000000..718b59d5
--- /dev/null
+++ b/sdk/pom.xml
@@ -0,0 +1,346 @@
+<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/maven-v4_0_0.xsd">
+<modelVersion>4.0.0</modelVersion>
+
+<parent>
+    <groupId>io.github.outscale</groupId>
+    <artifactId>osc-sdk-java-parent</artifactId>
+    <version>0.8.0</version>
+</parent>
+
+<artifactId>osc-sdk-java</artifactId>
+<packaging>jar</packaging>
+<name>osc-sdk-java SDK</name>
+
+<build>
+    <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-compiler-plugin</artifactId>
+            <version>3.10.1</version>
+            <configuration>
+                <fork>true</fork>
+                <meminitial>128m</meminitial>
+                <maxmem>512m</maxmem>
+                <compilerArgs>
+                    <arg>-Xlint:all</arg>
+                    <arg>-J-Xss4m</arg>
+                </compilerArgs>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-enforcer-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+                <execution>
+                    <id>enforce-maven</id>
+                    <goals>
+                        <goal>enforce</goal>
+                    </goals>
+                    <configuration>
+                        <rules>
+                            <requireMavenVersion>
+                                <version>2.2.0</version>
+                            </requireMavenVersion>
+                        </rules>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <version>2.22.2</version>
+            <configuration>
+                <systemProperties>
+                    <property>
+                        <name>loggerPath</name>
+                        <value>conf/log4j.properties</value>
+                    </property>
+                </systemProperties>
+                <argLine>-Xms512m -Xmx1500m</argLine>
+                <parallel>methods</parallel>
+                <threadCount>10</threadCount>
+            </configuration>
+            <dependencies>
+                <dependency>
+                    <groupId>org.junit.jupiter</groupId>
+                    <artifactId>junit-jupiter-engine</artifactId>
+                    <version>${junit-version}</version>
+                </dependency>
+            </dependencies>
+        </plugin>
+        <plugin>
+            <artifactId>maven-dependency-plugin</artifactId>
+            <version>3.5.0</version>
+            <executions>
+                <execution>
+                    <phase>package</phase>
+                    <goals>
+                        <goal>copy-dependencies</goal>
+                    </goals>
+                    <configuration>
+                        <outputDirectory>${project.build.directory}/lib</outputDirectory>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-jar-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>test-jar</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.codehaus.mojo</groupId>
+            <artifactId>build-helper-maven-plugin</artifactId>
+            <version>3.3.0</version>
+            <executions>
+                <execution>
+                    <id>add_sources</id>
+                    <phase>generate-sources</phase>
+                    <goals>
+                        <goal>add-source</goal>
+                    </goals>
+                    <configuration>
+                        <sources>
+                            <source>src/main/java</source>
+                        </sources>
+                    </configuration>
+                </execution>
+                <execution>
+                    <id>add_test_sources</id>
+                    <phase>generate-test-sources</phase>
+                    <goals>
+                        <goal>add-test-source</goal>
+                    </goals>
+                    <configuration>
+                        <sources>
+                            <source>src/test/java</source>
+                        </sources>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <version>3.4.1</version>
+            <executions>
+                <execution>
+                    <id>attach-javadocs</id>
+                    <goals>
+                        <goal>jar</goal>
+                    </goals>
+                </execution>
+            </executions>
+            <configuration>
+                <doclint>none</doclint>
+                <tags>
+                    <tag>
+                        <name>http.response.details</name>
+                        <placement>a</placement>
+                        <head>Http Response Details:</head>
+                    </tag>
+                </tags>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-source-plugin</artifactId>
+            <version>3.2.1</version>
+            <executions>
+                <execution>
+                    <id>attach-sources</id>
+                    <goals>
+                        <goal>jar-no-fork</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>com.diffplug.spotless</groupId>
+            <artifactId>spotless-maven-plugin</artifactId>
+            <version>${spotless.version}</version>
+            <configuration>
+                <formats>
+                    <format>
+                        <includes>
+                            <include>.gitignore</include>
+                        </includes>
+                        <trimTrailingWhitespace/>
+                        <endWithNewline/>
+                        <indent>
+                            <spaces>true</spaces>
+                            <spacesPerTab>4</spacesPerTab>
+                        </indent>
+                    </format>
+                </formats>
+                <java>
+                    <googleJavaFormat>
+                        <version>1.8</version>
+                        <style>AOSP</style>
+                        <reflowLongStrings>true</reflowLongStrings>
+                    </googleJavaFormat>
+                    <removeUnusedImports/>
+                    <importOrder/>
+                </java>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.sonatype.plugins</groupId>
+            <artifactId>nexus-staging-maven-plugin</artifactId>
+            <version>1.6.7</version>
+            <extensions>true</extensions>
+            <configuration>
+                <serverId>ossrh</serverId>
+                <nexusUrl>https://s01.oss.sonatype.org/</nexusUrl>
+                <autoReleaseAfterClose>true</autoReleaseAfterClose>
+            </configuration>
+        </plugin>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-gpg-plugin</artifactId>
+            <version>3.0.1</version>
+            <executions>
+                <execution>
+                    <id>sign-artifacts</id>
+                    <phase>verify</phase>
+                    <goals>
+                        <goal>sign</goal>
+                    </goals>
+                </execution>
+            </executions>
+        </plugin>
+        <plugin>
+            <groupId>org.openapitools</groupId>
+            <artifactId>openapi-generator-maven-plugin</artifactId>
+            <version>7.15.0</version>
+            <executions>
+                <execution>
+                    <goals>
+                        <goal>generate</goal>
+                    </goals>
+                    <configuration>
+                        <gitHost>github.com</gitHost>
+                        <gitUserId>outscale</gitUserId>
+                        <gitRepoId>osc-sdk-java</gitRepoId>
+                        <inputSpec>https://raw.githubusercontent.com/outscale/osc-api-deploy/refs/tags/v${outscale-api-version}/outscale.yaml</inputSpec>
+                        <generatorName>java</generatorName>
+                        <templateDirectory>templates</templateDirectory>
+                        <groupId>io.github.outscale</groupId>
+                        <artifactId>osc-sdk-java</artifactId>
+                        <configOptions>
+                            <sourceFolder>src/gen/java/main</sourceFolder>
+                            <hideGenerationTimestamp>true</hideGenerationTimestamp>
+                            <withAWSV4Signature>true</withAWSV4Signature>
+                        </configOptions>
+                        <packageName>io.github.outscale.osc_sdk_java</packageName>
+                        <apiPackage>io.github.outscale.osc_sdk_java.client.handler</apiPackage>
+                        <modelPackage>io.github.outscale.osc_sdk_java.client.model</modelPackage>
+                        <invokerPackage>io.github.outscale.osc_sdk_java.client</invokerPackage>
+                    </configuration>
+                </execution>
+            </executions>
+        </plugin>
+    </plugins>
+</build>
+<dependencyManagement>
+    <dependencies>
+        <dependency>
+            <groupId>io.github.outscale</groupId>
+            <artifactId>osc-sdk-java-sbom</artifactId>
+            <version>0.8.0</version>
+            <type>pom</type>
+            <scope>import</scope>
+        </dependency>
+    </dependencies>
+</dependencyManagement>
+
+<dependencies>  
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>logging-interceptor</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>io.gsonfire</groupId>
+        <artifactId>gson-fire</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.openapitools</groupId>
+        <artifactId>jackson-databind-nullable</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>auth</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>dev.failsafe</groupId>
+        <artifactId>failsafe</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>dev.failsafe</groupId>
+        <artifactId>failsafe-okhttp</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-runner</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-tls</artifactId>
+    </dependency>
+</dependencies>
+</project>
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java
similarity index 100%
rename from src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java
rename to sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationEnv.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationException.java b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationException.java
similarity index 100%
rename from src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationException.java
rename to sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationException.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java
similarity index 100%
rename from src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java
rename to sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationFile.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java
similarity index 99%
rename from src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java
rename to sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java
index 5f95d08f..a77a873e 100644
--- a/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java
+++ b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/ConfigurationInitializer.java
@@ -203,6 +203,7 @@ protected ApiClient getApiClient(Profile profile) throws ConfigurationException
                             .heldCertificate(clientCertificate)
                             .build();
 
+
             OkHttpClient client =
                     new OkHttpClient.Builder()
                             .sslSocketFactory(
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
similarity index 100%
rename from src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
rename to sdk/src/main/java/io/github/outscale/osc_sdk_java/client/Endpoint.java
diff --git a/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java b/sdk/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
similarity index 100%
rename from src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
rename to sdk/src/main/java/io/github/outscale/osc_sdk_java/client/Profile.java
diff --git a/templates/ApiClient.mustache b/sdk/templates/ApiClient.mustache
similarity index 100%
rename from templates/ApiClient.mustache
rename to sdk/templates/ApiClient.mustache
diff --git a/templates/BeanValidationException.mustache b/sdk/templates/BeanValidationException.mustache
similarity index 100%
rename from templates/BeanValidationException.mustache
rename to sdk/templates/BeanValidationException.mustache
diff --git a/templates/Configuration.mustache b/sdk/templates/Configuration.mustache
similarity index 100%
rename from templates/Configuration.mustache
rename to sdk/templates/Configuration.mustache
diff --git a/templates/CustomInstantDeserializer.mustache b/sdk/templates/CustomInstantDeserializer.mustache
similarity index 100%
rename from templates/CustomInstantDeserializer.mustache
rename to sdk/templates/CustomInstantDeserializer.mustache
diff --git a/templates/JSON.mustache b/sdk/templates/JSON.mustache
similarity index 100%
rename from templates/JSON.mustache
rename to sdk/templates/JSON.mustache
diff --git a/templates/JavaTimeFormatter.mustache b/sdk/templates/JavaTimeFormatter.mustache
similarity index 100%
rename from templates/JavaTimeFormatter.mustache
rename to sdk/templates/JavaTimeFormatter.mustache
diff --git a/templates/Pair.mustache b/sdk/templates/Pair.mustache
similarity index 100%
rename from templates/Pair.mustache
rename to sdk/templates/Pair.mustache
diff --git a/templates/README.mustache b/sdk/templates/README.mustache
similarity index 100%
rename from templates/README.mustache
rename to sdk/templates/README.mustache
diff --git a/templates/RFC3339DateFormat.mustache b/sdk/templates/RFC3339DateFormat.mustache
similarity index 100%
rename from templates/RFC3339DateFormat.mustache
rename to sdk/templates/RFC3339DateFormat.mustache
diff --git a/templates/RFC3339InstantDeserializer.mustache b/sdk/templates/RFC3339InstantDeserializer.mustache
similarity index 100%
rename from templates/RFC3339InstantDeserializer.mustache
rename to sdk/templates/RFC3339InstantDeserializer.mustache
diff --git a/templates/RFC3339JavaTimeModule.mustache b/sdk/templates/RFC3339JavaTimeModule.mustache
similarity index 100%
rename from templates/RFC3339JavaTimeModule.mustache
rename to sdk/templates/RFC3339JavaTimeModule.mustache
diff --git a/templates/ServerConfiguration.mustache b/sdk/templates/ServerConfiguration.mustache
similarity index 100%
rename from templates/ServerConfiguration.mustache
rename to sdk/templates/ServerConfiguration.mustache
diff --git a/templates/ServerVariable.mustache b/sdk/templates/ServerVariable.mustache
similarity index 100%
rename from templates/ServerVariable.mustache
rename to sdk/templates/ServerVariable.mustache
diff --git a/templates/StringUtil.mustache b/sdk/templates/StringUtil.mustache
similarity index 100%
rename from templates/StringUtil.mustache
rename to sdk/templates/StringUtil.mustache
diff --git a/templates/additionalEnumTypeAnnotations.mustache b/sdk/templates/additionalEnumTypeAnnotations.mustache
similarity index 100%
rename from templates/additionalEnumTypeAnnotations.mustache
rename to sdk/templates/additionalEnumTypeAnnotations.mustache
diff --git a/templates/additionalModelTypeAnnotations.mustache b/sdk/templates/additionalModelTypeAnnotations.mustache
similarity index 100%
rename from templates/additionalModelTypeAnnotations.mustache
rename to sdk/templates/additionalModelTypeAnnotations.mustache
diff --git a/templates/additionalOneOfTypeAnnotations.mustache b/sdk/templates/additionalOneOfTypeAnnotations.mustache
similarity index 100%
rename from templates/additionalOneOfTypeAnnotations.mustache
rename to sdk/templates/additionalOneOfTypeAnnotations.mustache
diff --git a/templates/api.mustache b/sdk/templates/api.mustache
similarity index 100%
rename from templates/api.mustache
rename to sdk/templates/api.mustache
diff --git a/templates/apiException.mustache b/sdk/templates/apiException.mustache
similarity index 100%
rename from templates/apiException.mustache
rename to sdk/templates/apiException.mustache
diff --git a/templates/apiOperation.mustache b/sdk/templates/apiOperation.mustache
similarity index 100%
rename from templates/apiOperation.mustache
rename to sdk/templates/apiOperation.mustache
diff --git a/templates/api_doc.mustache b/sdk/templates/api_doc.mustache
similarity index 100%
rename from templates/api_doc.mustache
rename to sdk/templates/api_doc.mustache
diff --git a/templates/api_test.mustache b/sdk/templates/api_test.mustache
similarity index 100%
rename from templates/api_test.mustache
rename to sdk/templates/api_test.mustache
diff --git a/templates/auth/ApiKeyAuth.mustache b/sdk/templates/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/auth/ApiKeyAuth.mustache
rename to sdk/templates/auth/ApiKeyAuth.mustache
diff --git a/templates/auth/Authentication.mustache b/sdk/templates/auth/Authentication.mustache
similarity index 100%
rename from templates/auth/Authentication.mustache
rename to sdk/templates/auth/Authentication.mustache
diff --git a/templates/auth/HttpBasicAuth.mustache b/sdk/templates/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/auth/HttpBasicAuth.mustache
rename to sdk/templates/auth/HttpBasicAuth.mustache
diff --git a/templates/auth/HttpBearerAuth.mustache b/sdk/templates/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/auth/HttpBearerAuth.mustache
rename to sdk/templates/auth/HttpBearerAuth.mustache
diff --git a/templates/auth/OAuth.mustache b/sdk/templates/auth/OAuth.mustache
similarity index 100%
rename from templates/auth/OAuth.mustache
rename to sdk/templates/auth/OAuth.mustache
diff --git a/templates/auth/OAuthFlow.mustache b/sdk/templates/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/auth/OAuthFlow.mustache
rename to sdk/templates/auth/OAuthFlow.mustache
diff --git a/templates/beanValidation.mustache b/sdk/templates/beanValidation.mustache
similarity index 100%
rename from templates/beanValidation.mustache
rename to sdk/templates/beanValidation.mustache
diff --git a/templates/beanValidationCore.mustache b/sdk/templates/beanValidationCore.mustache
similarity index 100%
rename from templates/beanValidationCore.mustache
rename to sdk/templates/beanValidationCore.mustache
diff --git a/templates/beanValidationQueryParams.mustache b/sdk/templates/beanValidationQueryParams.mustache
similarity index 100%
rename from templates/beanValidationQueryParams.mustache
rename to sdk/templates/beanValidationQueryParams.mustache
diff --git a/templates/build.gradle.mustache b/sdk/templates/build.gradle.mustache
similarity index 100%
rename from templates/build.gradle.mustache
rename to sdk/templates/build.gradle.mustache
diff --git a/templates/build.sbt.mustache b/sdk/templates/build.sbt.mustache
similarity index 100%
rename from templates/build.sbt.mustache
rename to sdk/templates/build.sbt.mustache
diff --git a/templates/enum_outer_doc.mustache b/sdk/templates/enum_outer_doc.mustache
similarity index 100%
rename from templates/enum_outer_doc.mustache
rename to sdk/templates/enum_outer_doc.mustache
diff --git a/templates/generatedAnnotation.mustache b/sdk/templates/generatedAnnotation.mustache
similarity index 100%
rename from templates/generatedAnnotation.mustache
rename to sdk/templates/generatedAnnotation.mustache
diff --git a/templates/git_push.sh.mustache b/sdk/templates/git_push.sh.mustache
similarity index 100%
rename from templates/git_push.sh.mustache
rename to sdk/templates/git_push.sh.mustache
diff --git a/templates/gitignore.mustache b/sdk/templates/gitignore.mustache
similarity index 100%
rename from templates/gitignore.mustache
rename to sdk/templates/gitignore.mustache
diff --git a/templates/gradle-wrapper.jar b/sdk/templates/gradle-wrapper.jar
similarity index 100%
rename from templates/gradle-wrapper.jar
rename to sdk/templates/gradle-wrapper.jar
diff --git a/templates/gradle-wrapper.properties.mustache b/sdk/templates/gradle-wrapper.properties.mustache
similarity index 100%
rename from templates/gradle-wrapper.properties.mustache
rename to sdk/templates/gradle-wrapper.properties.mustache
diff --git a/templates/gradle.properties.mustache b/sdk/templates/gradle.properties.mustache
similarity index 100%
rename from templates/gradle.properties.mustache
rename to sdk/templates/gradle.properties.mustache
diff --git a/templates/gradlew.bat.mustache b/sdk/templates/gradlew.bat.mustache
similarity index 100%
rename from templates/gradlew.bat.mustache
rename to sdk/templates/gradlew.bat.mustache
diff --git a/templates/gradlew.mustache b/sdk/templates/gradlew.mustache
similarity index 100%
rename from templates/gradlew.mustache
rename to sdk/templates/gradlew.mustache
diff --git a/templates/jackson_annotations.mustache b/sdk/templates/jackson_annotations.mustache
similarity index 100%
rename from templates/jackson_annotations.mustache
rename to sdk/templates/jackson_annotations.mustache
diff --git a/templates/javaBuilder.mustache b/sdk/templates/javaBuilder.mustache
similarity index 100%
rename from templates/javaBuilder.mustache
rename to sdk/templates/javaBuilder.mustache
diff --git a/templates/libraries/apache-httpclient/ApiClient.mustache b/sdk/templates/libraries/apache-httpclient/ApiClient.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/ApiClient.mustache
rename to sdk/templates/libraries/apache-httpclient/ApiClient.mustache
diff --git a/templates/libraries/apache-httpclient/BaseApi.mustache b/sdk/templates/libraries/apache-httpclient/BaseApi.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/BaseApi.mustache
rename to sdk/templates/libraries/apache-httpclient/BaseApi.mustache
diff --git a/templates/libraries/apache-httpclient/README.mustache b/sdk/templates/libraries/apache-httpclient/README.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/README.mustache
rename to sdk/templates/libraries/apache-httpclient/README.mustache
diff --git a/templates/libraries/apache-httpclient/api.mustache b/sdk/templates/libraries/apache-httpclient/api.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/api.mustache
rename to sdk/templates/libraries/apache-httpclient/api.mustache
diff --git a/templates/libraries/apache-httpclient/api_test.mustache b/sdk/templates/libraries/apache-httpclient/api_test.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/api_test.mustache
rename to sdk/templates/libraries/apache-httpclient/api_test.mustache
diff --git a/templates/libraries/apache-httpclient/build.gradle.mustache b/sdk/templates/libraries/apache-httpclient/build.gradle.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/build.gradle.mustache
rename to sdk/templates/libraries/apache-httpclient/build.gradle.mustache
diff --git a/templates/libraries/apache-httpclient/pom.mustache b/sdk/templates/libraries/apache-httpclient/pom.mustache
similarity index 100%
rename from templates/libraries/apache-httpclient/pom.mustache
rename to sdk/templates/libraries/apache-httpclient/pom.mustache
diff --git a/templates/libraries/feign/ApiClient.mustache b/sdk/templates/libraries/feign/ApiClient.mustache
similarity index 100%
rename from templates/libraries/feign/ApiClient.mustache
rename to sdk/templates/libraries/feign/ApiClient.mustache
diff --git a/templates/libraries/feign/ApiResponseDecoder.mustache b/sdk/templates/libraries/feign/ApiResponseDecoder.mustache
similarity index 100%
rename from templates/libraries/feign/ApiResponseDecoder.mustache
rename to sdk/templates/libraries/feign/ApiResponseDecoder.mustache
diff --git a/templates/libraries/feign/EncodingUtils.mustache b/sdk/templates/libraries/feign/EncodingUtils.mustache
similarity index 100%
rename from templates/libraries/feign/EncodingUtils.mustache
rename to sdk/templates/libraries/feign/EncodingUtils.mustache
diff --git a/templates/libraries/feign/ParamExpander.mustache b/sdk/templates/libraries/feign/ParamExpander.mustache
similarity index 100%
rename from templates/libraries/feign/ParamExpander.mustache
rename to sdk/templates/libraries/feign/ParamExpander.mustache
diff --git a/templates/libraries/feign/README.mustache b/sdk/templates/libraries/feign/README.mustache
similarity index 100%
rename from templates/libraries/feign/README.mustache
rename to sdk/templates/libraries/feign/README.mustache
diff --git a/templates/libraries/feign/additional_properties.mustache b/sdk/templates/libraries/feign/additional_properties.mustache
similarity index 100%
rename from templates/libraries/feign/additional_properties.mustache
rename to sdk/templates/libraries/feign/additional_properties.mustache
diff --git a/templates/libraries/feign/api.mustache b/sdk/templates/libraries/feign/api.mustache
similarity index 100%
rename from templates/libraries/feign/api.mustache
rename to sdk/templates/libraries/feign/api.mustache
diff --git a/templates/libraries/feign/api_test.mustache b/sdk/templates/libraries/feign/api_test.mustache
similarity index 100%
rename from templates/libraries/feign/api_test.mustache
rename to sdk/templates/libraries/feign/api_test.mustache
diff --git a/templates/libraries/feign/auth/ApiErrorDecoder.mustache b/sdk/templates/libraries/feign/auth/ApiErrorDecoder.mustache
similarity index 100%
rename from templates/libraries/feign/auth/ApiErrorDecoder.mustache
rename to sdk/templates/libraries/feign/auth/ApiErrorDecoder.mustache
diff --git a/templates/libraries/feign/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/feign/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/feign/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/feign/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/feign/auth/DefaultApi20Impl.mustache b/sdk/templates/libraries/feign/auth/DefaultApi20Impl.mustache
similarity index 100%
rename from templates/libraries/feign/auth/DefaultApi20Impl.mustache
rename to sdk/templates/libraries/feign/auth/DefaultApi20Impl.mustache
diff --git a/templates/libraries/feign/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/feign/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/feign/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/feign/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/feign/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/feign/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/feign/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/feign/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/feign/auth/OAuth.mustache b/sdk/templates/libraries/feign/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/feign/auth/OAuth.mustache
rename to sdk/templates/libraries/feign/auth/OAuth.mustache
diff --git a/templates/libraries/feign/auth/OauthClientCredentialsGrant.mustache b/sdk/templates/libraries/feign/auth/OauthClientCredentialsGrant.mustache
similarity index 100%
rename from templates/libraries/feign/auth/OauthClientCredentialsGrant.mustache
rename to sdk/templates/libraries/feign/auth/OauthClientCredentialsGrant.mustache
diff --git a/templates/libraries/feign/auth/OauthPasswordGrant.mustache b/sdk/templates/libraries/feign/auth/OauthPasswordGrant.mustache
similarity index 100%
rename from templates/libraries/feign/auth/OauthPasswordGrant.mustache
rename to sdk/templates/libraries/feign/auth/OauthPasswordGrant.mustache
diff --git a/templates/libraries/feign/build.gradle.mustache b/sdk/templates/libraries/feign/build.gradle.mustache
similarity index 100%
rename from templates/libraries/feign/build.gradle.mustache
rename to sdk/templates/libraries/feign/build.gradle.mustache
diff --git a/templates/libraries/feign/build.sbt.mustache b/sdk/templates/libraries/feign/build.sbt.mustache
similarity index 100%
rename from templates/libraries/feign/build.sbt.mustache
rename to sdk/templates/libraries/feign/build.sbt.mustache
diff --git a/templates/libraries/feign/model.mustache b/sdk/templates/libraries/feign/model.mustache
similarity index 100%
rename from templates/libraries/feign/model.mustache
rename to sdk/templates/libraries/feign/model.mustache
diff --git a/templates/libraries/feign/model/ApiResponse.mustache b/sdk/templates/libraries/feign/model/ApiResponse.mustache
similarity index 100%
rename from templates/libraries/feign/model/ApiResponse.mustache
rename to sdk/templates/libraries/feign/model/ApiResponse.mustache
diff --git a/templates/libraries/feign/model_test.mustache b/sdk/templates/libraries/feign/model_test.mustache
similarity index 100%
rename from templates/libraries/feign/model_test.mustache
rename to sdk/templates/libraries/feign/model_test.mustache
diff --git a/templates/libraries/feign/pojo.mustache b/sdk/templates/libraries/feign/pojo.mustache
similarity index 100%
rename from templates/libraries/feign/pojo.mustache
rename to sdk/templates/libraries/feign/pojo.mustache
diff --git a/templates/libraries/feign/pom.mustache b/sdk/templates/libraries/feign/pom.mustache
similarity index 100%
rename from templates/libraries/feign/pom.mustache
rename to sdk/templates/libraries/feign/pom.mustache
diff --git a/templates/libraries/google-api-client/ApiClient.mustache b/sdk/templates/libraries/google-api-client/ApiClient.mustache
similarity index 100%
rename from templates/libraries/google-api-client/ApiClient.mustache
rename to sdk/templates/libraries/google-api-client/ApiClient.mustache
diff --git a/templates/libraries/google-api-client/api.mustache b/sdk/templates/libraries/google-api-client/api.mustache
similarity index 100%
rename from templates/libraries/google-api-client/api.mustache
rename to sdk/templates/libraries/google-api-client/api.mustache
diff --git a/templates/libraries/google-api-client/api_test.mustache b/sdk/templates/libraries/google-api-client/api_test.mustache
similarity index 100%
rename from templates/libraries/google-api-client/api_test.mustache
rename to sdk/templates/libraries/google-api-client/api_test.mustache
diff --git a/templates/libraries/google-api-client/build.gradle.mustache b/sdk/templates/libraries/google-api-client/build.gradle.mustache
similarity index 100%
rename from templates/libraries/google-api-client/build.gradle.mustache
rename to sdk/templates/libraries/google-api-client/build.gradle.mustache
diff --git a/templates/libraries/google-api-client/build.sbt.mustache b/sdk/templates/libraries/google-api-client/build.sbt.mustache
similarity index 100%
rename from templates/libraries/google-api-client/build.sbt.mustache
rename to sdk/templates/libraries/google-api-client/build.sbt.mustache
diff --git a/templates/libraries/google-api-client/pom.mustache b/sdk/templates/libraries/google-api-client/pom.mustache
similarity index 100%
rename from templates/libraries/google-api-client/pom.mustache
rename to sdk/templates/libraries/google-api-client/pom.mustache
diff --git a/templates/libraries/jersey2/AbstractOpenApiSchema.mustache b/sdk/templates/libraries/jersey2/AbstractOpenApiSchema.mustache
similarity index 100%
rename from templates/libraries/jersey2/AbstractOpenApiSchema.mustache
rename to sdk/templates/libraries/jersey2/AbstractOpenApiSchema.mustache
diff --git a/templates/libraries/jersey2/ApiClient.mustache b/sdk/templates/libraries/jersey2/ApiClient.mustache
similarity index 100%
rename from templates/libraries/jersey2/ApiClient.mustache
rename to sdk/templates/libraries/jersey2/ApiClient.mustache
diff --git a/templates/libraries/jersey2/ApiResponse.mustache b/sdk/templates/libraries/jersey2/ApiResponse.mustache
similarity index 100%
rename from templates/libraries/jersey2/ApiResponse.mustache
rename to sdk/templates/libraries/jersey2/ApiResponse.mustache
diff --git a/templates/libraries/jersey2/JSON.mustache b/sdk/templates/libraries/jersey2/JSON.mustache
similarity index 100%
rename from templates/libraries/jersey2/JSON.mustache
rename to sdk/templates/libraries/jersey2/JSON.mustache
diff --git a/templates/libraries/jersey2/additional_properties.mustache b/sdk/templates/libraries/jersey2/additional_properties.mustache
similarity index 100%
rename from templates/libraries/jersey2/additional_properties.mustache
rename to sdk/templates/libraries/jersey2/additional_properties.mustache
diff --git a/templates/libraries/jersey2/anyof_model.mustache b/sdk/templates/libraries/jersey2/anyof_model.mustache
similarity index 100%
rename from templates/libraries/jersey2/anyof_model.mustache
rename to sdk/templates/libraries/jersey2/anyof_model.mustache
diff --git a/templates/libraries/jersey2/api.mustache b/sdk/templates/libraries/jersey2/api.mustache
similarity index 100%
rename from templates/libraries/jersey2/api.mustache
rename to sdk/templates/libraries/jersey2/api.mustache
diff --git a/templates/libraries/jersey2/apiException.mustache b/sdk/templates/libraries/jersey2/apiException.mustache
similarity index 100%
rename from templates/libraries/jersey2/apiException.mustache
rename to sdk/templates/libraries/jersey2/apiException.mustache
diff --git a/templates/libraries/jersey2/api_doc.mustache b/sdk/templates/libraries/jersey2/api_doc.mustache
similarity index 100%
rename from templates/libraries/jersey2/api_doc.mustache
rename to sdk/templates/libraries/jersey2/api_doc.mustache
diff --git a/templates/libraries/jersey2/api_test.mustache b/sdk/templates/libraries/jersey2/api_test.mustache
similarity index 100%
rename from templates/libraries/jersey2/api_test.mustache
rename to sdk/templates/libraries/jersey2/api_test.mustache
diff --git a/templates/libraries/jersey2/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/jersey2/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/jersey2/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/jersey2/auth/Authentication.mustache b/sdk/templates/libraries/jersey2/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/Authentication.mustache
rename to sdk/templates/libraries/jersey2/auth/Authentication.mustache
diff --git a/templates/libraries/jersey2/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/jersey2/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/jersey2/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/jersey2/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/jersey2/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/jersey2/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/jersey2/auth/HttpSignatureAuth.mustache b/sdk/templates/libraries/jersey2/auth/HttpSignatureAuth.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/HttpSignatureAuth.mustache
rename to sdk/templates/libraries/jersey2/auth/HttpSignatureAuth.mustache
diff --git a/templates/libraries/jersey2/auth/OAuth.mustache b/sdk/templates/libraries/jersey2/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/OAuth.mustache
rename to sdk/templates/libraries/jersey2/auth/OAuth.mustache
diff --git a/templates/libraries/jersey2/auth/OAuthFlow.mustache b/sdk/templates/libraries/jersey2/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/libraries/jersey2/auth/OAuthFlow.mustache
rename to sdk/templates/libraries/jersey2/auth/OAuthFlow.mustache
diff --git a/templates/libraries/jersey2/build.gradle.mustache b/sdk/templates/libraries/jersey2/build.gradle.mustache
similarity index 100%
rename from templates/libraries/jersey2/build.gradle.mustache
rename to sdk/templates/libraries/jersey2/build.gradle.mustache
diff --git a/templates/libraries/jersey2/build.sbt.mustache b/sdk/templates/libraries/jersey2/build.sbt.mustache
similarity index 100%
rename from templates/libraries/jersey2/build.sbt.mustache
rename to sdk/templates/libraries/jersey2/build.sbt.mustache
diff --git a/templates/libraries/jersey2/model.mustache b/sdk/templates/libraries/jersey2/model.mustache
similarity index 100%
rename from templates/libraries/jersey2/model.mustache
rename to sdk/templates/libraries/jersey2/model.mustache
diff --git a/templates/libraries/jersey2/model_anyof_doc.mustache b/sdk/templates/libraries/jersey2/model_anyof_doc.mustache
similarity index 100%
rename from templates/libraries/jersey2/model_anyof_doc.mustache
rename to sdk/templates/libraries/jersey2/model_anyof_doc.mustache
diff --git a/templates/libraries/jersey2/model_doc.mustache b/sdk/templates/libraries/jersey2/model_doc.mustache
similarity index 100%
rename from templates/libraries/jersey2/model_doc.mustache
rename to sdk/templates/libraries/jersey2/model_doc.mustache
diff --git a/templates/libraries/jersey2/model_oneof_doc.mustache b/sdk/templates/libraries/jersey2/model_oneof_doc.mustache
similarity index 100%
rename from templates/libraries/jersey2/model_oneof_doc.mustache
rename to sdk/templates/libraries/jersey2/model_oneof_doc.mustache
diff --git a/templates/libraries/jersey2/model_test.mustache b/sdk/templates/libraries/jersey2/model_test.mustache
similarity index 100%
rename from templates/libraries/jersey2/model_test.mustache
rename to sdk/templates/libraries/jersey2/model_test.mustache
diff --git a/templates/libraries/jersey2/oneof_model.mustache b/sdk/templates/libraries/jersey2/oneof_model.mustache
similarity index 100%
rename from templates/libraries/jersey2/oneof_model.mustache
rename to sdk/templates/libraries/jersey2/oneof_model.mustache
diff --git a/templates/libraries/jersey2/pojo.mustache b/sdk/templates/libraries/jersey2/pojo.mustache
similarity index 100%
rename from templates/libraries/jersey2/pojo.mustache
rename to sdk/templates/libraries/jersey2/pojo.mustache
diff --git a/templates/libraries/jersey2/pom.mustache b/sdk/templates/libraries/jersey2/pom.mustache
similarity index 100%
rename from templates/libraries/jersey2/pom.mustache
rename to sdk/templates/libraries/jersey2/pom.mustache
diff --git a/templates/libraries/jersey3/AbstractOpenApiSchema.mustache b/sdk/templates/libraries/jersey3/AbstractOpenApiSchema.mustache
similarity index 100%
rename from templates/libraries/jersey3/AbstractOpenApiSchema.mustache
rename to sdk/templates/libraries/jersey3/AbstractOpenApiSchema.mustache
diff --git a/templates/libraries/jersey3/ApiClient.mustache b/sdk/templates/libraries/jersey3/ApiClient.mustache
similarity index 100%
rename from templates/libraries/jersey3/ApiClient.mustache
rename to sdk/templates/libraries/jersey3/ApiClient.mustache
diff --git a/templates/libraries/jersey3/ApiResponse.mustache b/sdk/templates/libraries/jersey3/ApiResponse.mustache
similarity index 100%
rename from templates/libraries/jersey3/ApiResponse.mustache
rename to sdk/templates/libraries/jersey3/ApiResponse.mustache
diff --git a/templates/libraries/jersey3/JSON.mustache b/sdk/templates/libraries/jersey3/JSON.mustache
similarity index 100%
rename from templates/libraries/jersey3/JSON.mustache
rename to sdk/templates/libraries/jersey3/JSON.mustache
diff --git a/templates/libraries/jersey3/additional_properties.mustache b/sdk/templates/libraries/jersey3/additional_properties.mustache
similarity index 100%
rename from templates/libraries/jersey3/additional_properties.mustache
rename to sdk/templates/libraries/jersey3/additional_properties.mustache
diff --git a/templates/libraries/jersey3/anyof_model.mustache b/sdk/templates/libraries/jersey3/anyof_model.mustache
similarity index 100%
rename from templates/libraries/jersey3/anyof_model.mustache
rename to sdk/templates/libraries/jersey3/anyof_model.mustache
diff --git a/templates/libraries/jersey3/api.mustache b/sdk/templates/libraries/jersey3/api.mustache
similarity index 100%
rename from templates/libraries/jersey3/api.mustache
rename to sdk/templates/libraries/jersey3/api.mustache
diff --git a/templates/libraries/jersey3/apiException.mustache b/sdk/templates/libraries/jersey3/apiException.mustache
similarity index 100%
rename from templates/libraries/jersey3/apiException.mustache
rename to sdk/templates/libraries/jersey3/apiException.mustache
diff --git a/templates/libraries/jersey3/api_doc.mustache b/sdk/templates/libraries/jersey3/api_doc.mustache
similarity index 100%
rename from templates/libraries/jersey3/api_doc.mustache
rename to sdk/templates/libraries/jersey3/api_doc.mustache
diff --git a/templates/libraries/jersey3/api_test.mustache b/sdk/templates/libraries/jersey3/api_test.mustache
similarity index 100%
rename from templates/libraries/jersey3/api_test.mustache
rename to sdk/templates/libraries/jersey3/api_test.mustache
diff --git a/templates/libraries/jersey3/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/jersey3/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/jersey3/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/jersey3/auth/Authentication.mustache b/sdk/templates/libraries/jersey3/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/Authentication.mustache
rename to sdk/templates/libraries/jersey3/auth/Authentication.mustache
diff --git a/templates/libraries/jersey3/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/jersey3/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/jersey3/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/jersey3/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/jersey3/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/jersey3/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/jersey3/auth/HttpSignatureAuth.mustache b/sdk/templates/libraries/jersey3/auth/HttpSignatureAuth.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/HttpSignatureAuth.mustache
rename to sdk/templates/libraries/jersey3/auth/HttpSignatureAuth.mustache
diff --git a/templates/libraries/jersey3/auth/OAuth.mustache b/sdk/templates/libraries/jersey3/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/OAuth.mustache
rename to sdk/templates/libraries/jersey3/auth/OAuth.mustache
diff --git a/templates/libraries/jersey3/auth/OAuthFlow.mustache b/sdk/templates/libraries/jersey3/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/libraries/jersey3/auth/OAuthFlow.mustache
rename to sdk/templates/libraries/jersey3/auth/OAuthFlow.mustache
diff --git a/templates/libraries/jersey3/build.gradle.mustache b/sdk/templates/libraries/jersey3/build.gradle.mustache
similarity index 100%
rename from templates/libraries/jersey3/build.gradle.mustache
rename to sdk/templates/libraries/jersey3/build.gradle.mustache
diff --git a/templates/libraries/jersey3/build.sbt.mustache b/sdk/templates/libraries/jersey3/build.sbt.mustache
similarity index 100%
rename from templates/libraries/jersey3/build.sbt.mustache
rename to sdk/templates/libraries/jersey3/build.sbt.mustache
diff --git a/templates/libraries/jersey3/generatedAnnotation.mustache b/sdk/templates/libraries/jersey3/generatedAnnotation.mustache
similarity index 100%
rename from templates/libraries/jersey3/generatedAnnotation.mustache
rename to sdk/templates/libraries/jersey3/generatedAnnotation.mustache
diff --git a/templates/libraries/jersey3/model.mustache b/sdk/templates/libraries/jersey3/model.mustache
similarity index 100%
rename from templates/libraries/jersey3/model.mustache
rename to sdk/templates/libraries/jersey3/model.mustache
diff --git a/templates/libraries/jersey3/model_anyof_doc.mustache b/sdk/templates/libraries/jersey3/model_anyof_doc.mustache
similarity index 100%
rename from templates/libraries/jersey3/model_anyof_doc.mustache
rename to sdk/templates/libraries/jersey3/model_anyof_doc.mustache
diff --git a/templates/libraries/jersey3/model_doc.mustache b/sdk/templates/libraries/jersey3/model_doc.mustache
similarity index 100%
rename from templates/libraries/jersey3/model_doc.mustache
rename to sdk/templates/libraries/jersey3/model_doc.mustache
diff --git a/templates/libraries/jersey3/model_oneof_doc.mustache b/sdk/templates/libraries/jersey3/model_oneof_doc.mustache
similarity index 100%
rename from templates/libraries/jersey3/model_oneof_doc.mustache
rename to sdk/templates/libraries/jersey3/model_oneof_doc.mustache
diff --git a/templates/libraries/jersey3/model_test.mustache b/sdk/templates/libraries/jersey3/model_test.mustache
similarity index 100%
rename from templates/libraries/jersey3/model_test.mustache
rename to sdk/templates/libraries/jersey3/model_test.mustache
diff --git a/templates/libraries/jersey3/oneof_model.mustache b/sdk/templates/libraries/jersey3/oneof_model.mustache
similarity index 100%
rename from templates/libraries/jersey3/oneof_model.mustache
rename to sdk/templates/libraries/jersey3/oneof_model.mustache
diff --git a/templates/libraries/jersey3/pojo.mustache b/sdk/templates/libraries/jersey3/pojo.mustache
similarity index 100%
rename from templates/libraries/jersey3/pojo.mustache
rename to sdk/templates/libraries/jersey3/pojo.mustache
diff --git a/templates/libraries/jersey3/pom.mustache b/sdk/templates/libraries/jersey3/pom.mustache
similarity index 100%
rename from templates/libraries/jersey3/pom.mustache
rename to sdk/templates/libraries/jersey3/pom.mustache
diff --git a/templates/libraries/microprofile/README.mustache b/sdk/templates/libraries/microprofile/README.mustache
similarity index 100%
rename from templates/libraries/microprofile/README.mustache
rename to sdk/templates/libraries/microprofile/README.mustache
diff --git a/templates/libraries/microprofile/additional_properties.mustache b/sdk/templates/libraries/microprofile/additional_properties.mustache
similarity index 100%
rename from templates/libraries/microprofile/additional_properties.mustache
rename to sdk/templates/libraries/microprofile/additional_properties.mustache
diff --git a/templates/libraries/microprofile/api.mustache b/sdk/templates/libraries/microprofile/api.mustache
similarity index 100%
rename from templates/libraries/microprofile/api.mustache
rename to sdk/templates/libraries/microprofile/api.mustache
diff --git a/templates/libraries/microprofile/api_exception.mustache b/sdk/templates/libraries/microprofile/api_exception.mustache
similarity index 100%
rename from templates/libraries/microprofile/api_exception.mustache
rename to sdk/templates/libraries/microprofile/api_exception.mustache
diff --git a/templates/libraries/microprofile/api_exception_mapper.mustache b/sdk/templates/libraries/microprofile/api_exception_mapper.mustache
similarity index 100%
rename from templates/libraries/microprofile/api_exception_mapper.mustache
rename to sdk/templates/libraries/microprofile/api_exception_mapper.mustache
diff --git a/templates/libraries/microprofile/api_test.mustache b/sdk/templates/libraries/microprofile/api_test.mustache
similarity index 100%
rename from templates/libraries/microprofile/api_test.mustache
rename to sdk/templates/libraries/microprofile/api_test.mustache
diff --git a/templates/libraries/microprofile/beanValidation.mustache b/sdk/templates/libraries/microprofile/beanValidation.mustache
similarity index 100%
rename from templates/libraries/microprofile/beanValidation.mustache
rename to sdk/templates/libraries/microprofile/beanValidation.mustache
diff --git a/templates/libraries/microprofile/beanValidationCookieParams.mustache b/sdk/templates/libraries/microprofile/beanValidationCookieParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/beanValidationCookieParams.mustache
rename to sdk/templates/libraries/microprofile/beanValidationCookieParams.mustache
diff --git a/templates/libraries/microprofile/beanValidationCore.mustache b/sdk/templates/libraries/microprofile/beanValidationCore.mustache
similarity index 100%
rename from templates/libraries/microprofile/beanValidationCore.mustache
rename to sdk/templates/libraries/microprofile/beanValidationCore.mustache
diff --git a/templates/libraries/microprofile/beanValidationHeaderParams.mustache b/sdk/templates/libraries/microprofile/beanValidationHeaderParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/beanValidationHeaderParams.mustache
rename to sdk/templates/libraries/microprofile/beanValidationHeaderParams.mustache
diff --git a/templates/libraries/microprofile/beanValidationPathParams.mustache b/sdk/templates/libraries/microprofile/beanValidationPathParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/beanValidationPathParams.mustache
rename to sdk/templates/libraries/microprofile/beanValidationPathParams.mustache
diff --git a/templates/libraries/microprofile/beanValidationQueryParams.mustache b/sdk/templates/libraries/microprofile/beanValidationQueryParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/beanValidationQueryParams.mustache
rename to sdk/templates/libraries/microprofile/beanValidationQueryParams.mustache
diff --git a/templates/libraries/microprofile/bodyParams.mustache b/sdk/templates/libraries/microprofile/bodyParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/bodyParams.mustache
rename to sdk/templates/libraries/microprofile/bodyParams.mustache
diff --git a/templates/libraries/microprofile/bodyParamsImpl.mustache b/sdk/templates/libraries/microprofile/bodyParamsImpl.mustache
similarity index 100%
rename from templates/libraries/microprofile/bodyParamsImpl.mustache
rename to sdk/templates/libraries/microprofile/bodyParamsImpl.mustache
diff --git a/templates/libraries/microprofile/client_operation.mustache b/sdk/templates/libraries/microprofile/client_operation.mustache
similarity index 100%
rename from templates/libraries/microprofile/client_operation.mustache
rename to sdk/templates/libraries/microprofile/client_operation.mustache
diff --git a/templates/libraries/microprofile/cookieParams.mustache b/sdk/templates/libraries/microprofile/cookieParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/cookieParams.mustache
rename to sdk/templates/libraries/microprofile/cookieParams.mustache
diff --git a/templates/libraries/microprofile/cookieParamsImpl.mustache b/sdk/templates/libraries/microprofile/cookieParamsImpl.mustache
similarity index 100%
rename from templates/libraries/microprofile/cookieParamsImpl.mustache
rename to sdk/templates/libraries/microprofile/cookieParamsImpl.mustache
diff --git a/templates/libraries/microprofile/enumClass.mustache b/sdk/templates/libraries/microprofile/enumClass.mustache
similarity index 100%
rename from templates/libraries/microprofile/enumClass.mustache
rename to sdk/templates/libraries/microprofile/enumClass.mustache
diff --git a/templates/libraries/microprofile/enumOuterClass.mustache b/sdk/templates/libraries/microprofile/enumOuterClass.mustache
similarity index 100%
rename from templates/libraries/microprofile/enumOuterClass.mustache
rename to sdk/templates/libraries/microprofile/enumOuterClass.mustache
diff --git a/templates/libraries/microprofile/formParams.mustache b/sdk/templates/libraries/microprofile/formParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/formParams.mustache
rename to sdk/templates/libraries/microprofile/formParams.mustache
diff --git a/templates/libraries/microprofile/formParamsImpl.mustache b/sdk/templates/libraries/microprofile/formParamsImpl.mustache
similarity index 100%
rename from templates/libraries/microprofile/formParamsImpl.mustache
rename to sdk/templates/libraries/microprofile/formParamsImpl.mustache
diff --git a/templates/libraries/microprofile/formParamsNameSuffix.mustache b/sdk/templates/libraries/microprofile/formParamsNameSuffix.mustache
similarity index 100%
rename from templates/libraries/microprofile/formParamsNameSuffix.mustache
rename to sdk/templates/libraries/microprofile/formParamsNameSuffix.mustache
diff --git a/templates/libraries/microprofile/generatedAnnotation.mustache b/sdk/templates/libraries/microprofile/generatedAnnotation.mustache
similarity index 100%
rename from templates/libraries/microprofile/generatedAnnotation.mustache
rename to sdk/templates/libraries/microprofile/generatedAnnotation.mustache
diff --git a/templates/libraries/microprofile/headerParams.mustache b/sdk/templates/libraries/microprofile/headerParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/headerParams.mustache
rename to sdk/templates/libraries/microprofile/headerParams.mustache
diff --git a/templates/libraries/microprofile/headerParamsImpl.mustache b/sdk/templates/libraries/microprofile/headerParamsImpl.mustache
similarity index 100%
rename from templates/libraries/microprofile/headerParamsImpl.mustache
rename to sdk/templates/libraries/microprofile/headerParamsImpl.mustache
diff --git a/templates/libraries/microprofile/kumuluzee.beans.xml.mustache b/sdk/templates/libraries/microprofile/kumuluzee.beans.xml.mustache
similarity index 100%
rename from templates/libraries/microprofile/kumuluzee.beans.xml.mustache
rename to sdk/templates/libraries/microprofile/kumuluzee.beans.xml.mustache
diff --git a/templates/libraries/microprofile/kumuluzee.config.yaml.mustache b/sdk/templates/libraries/microprofile/kumuluzee.config.yaml.mustache
similarity index 100%
rename from templates/libraries/microprofile/kumuluzee.config.yaml.mustache
rename to sdk/templates/libraries/microprofile/kumuluzee.config.yaml.mustache
diff --git a/templates/libraries/microprofile/kumuluzee.pom.mustache b/sdk/templates/libraries/microprofile/kumuluzee.pom.mustache
similarity index 100%
rename from templates/libraries/microprofile/kumuluzee.pom.mustache
rename to sdk/templates/libraries/microprofile/kumuluzee.pom.mustache
diff --git a/templates/libraries/microprofile/licenseInfo.mustache b/sdk/templates/libraries/microprofile/licenseInfo.mustache
similarity index 100%
rename from templates/libraries/microprofile/licenseInfo.mustache
rename to sdk/templates/libraries/microprofile/licenseInfo.mustache
diff --git a/templates/libraries/microprofile/model.mustache b/sdk/templates/libraries/microprofile/model.mustache
similarity index 100%
rename from templates/libraries/microprofile/model.mustache
rename to sdk/templates/libraries/microprofile/model.mustache
diff --git a/templates/libraries/microprofile/pathParams.mustache b/sdk/templates/libraries/microprofile/pathParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/pathParams.mustache
rename to sdk/templates/libraries/microprofile/pathParams.mustache
diff --git a/templates/libraries/microprofile/pathParamsImpl.mustache b/sdk/templates/libraries/microprofile/pathParamsImpl.mustache
similarity index 100%
rename from templates/libraries/microprofile/pathParamsImpl.mustache
rename to sdk/templates/libraries/microprofile/pathParamsImpl.mustache
diff --git a/templates/libraries/microprofile/pojo.mustache b/sdk/templates/libraries/microprofile/pojo.mustache
similarity index 100%
rename from templates/libraries/microprofile/pojo.mustache
rename to sdk/templates/libraries/microprofile/pojo.mustache
diff --git a/templates/libraries/microprofile/pojoOverrides.mustache b/sdk/templates/libraries/microprofile/pojoOverrides.mustache
similarity index 100%
rename from templates/libraries/microprofile/pojoOverrides.mustache
rename to sdk/templates/libraries/microprofile/pojoOverrides.mustache
diff --git a/templates/libraries/microprofile/pom.mustache b/sdk/templates/libraries/microprofile/pom.mustache
similarity index 100%
rename from templates/libraries/microprofile/pom.mustache
rename to sdk/templates/libraries/microprofile/pom.mustache
diff --git a/templates/libraries/microprofile/pom_3.0.mustache b/sdk/templates/libraries/microprofile/pom_3.0.mustache
similarity index 100%
rename from templates/libraries/microprofile/pom_3.0.mustache
rename to sdk/templates/libraries/microprofile/pom_3.0.mustache
diff --git a/templates/libraries/microprofile/queryParams.mustache b/sdk/templates/libraries/microprofile/queryParams.mustache
similarity index 100%
rename from templates/libraries/microprofile/queryParams.mustache
rename to sdk/templates/libraries/microprofile/queryParams.mustache
diff --git a/templates/libraries/microprofile/queryParamsImpl.mustache b/sdk/templates/libraries/microprofile/queryParamsImpl.mustache
similarity index 100%
rename from templates/libraries/microprofile/queryParamsImpl.mustache
rename to sdk/templates/libraries/microprofile/queryParamsImpl.mustache
diff --git a/templates/libraries/microprofile/server_operation.mustache b/sdk/templates/libraries/microprofile/server_operation.mustache
similarity index 100%
rename from templates/libraries/microprofile/server_operation.mustache
rename to sdk/templates/libraries/microprofile/server_operation.mustache
diff --git a/templates/libraries/native/AbstractOpenApiSchema.mustache b/sdk/templates/libraries/native/AbstractOpenApiSchema.mustache
similarity index 100%
rename from templates/libraries/native/AbstractOpenApiSchema.mustache
rename to sdk/templates/libraries/native/AbstractOpenApiSchema.mustache
diff --git a/templates/libraries/native/ApiClient.mustache b/sdk/templates/libraries/native/ApiClient.mustache
similarity index 100%
rename from templates/libraries/native/ApiClient.mustache
rename to sdk/templates/libraries/native/ApiClient.mustache
diff --git a/templates/libraries/native/ApiResponse.mustache b/sdk/templates/libraries/native/ApiResponse.mustache
similarity index 100%
rename from templates/libraries/native/ApiResponse.mustache
rename to sdk/templates/libraries/native/ApiResponse.mustache
diff --git a/templates/libraries/native/JSON.mustache b/sdk/templates/libraries/native/JSON.mustache
similarity index 100%
rename from templates/libraries/native/JSON.mustache
rename to sdk/templates/libraries/native/JSON.mustache
diff --git a/templates/libraries/native/README.mustache b/sdk/templates/libraries/native/README.mustache
similarity index 100%
rename from templates/libraries/native/README.mustache
rename to sdk/templates/libraries/native/README.mustache
diff --git a/templates/libraries/native/additional_properties.mustache b/sdk/templates/libraries/native/additional_properties.mustache
similarity index 100%
rename from templates/libraries/native/additional_properties.mustache
rename to sdk/templates/libraries/native/additional_properties.mustache
diff --git a/templates/libraries/native/anyof_model.mustache b/sdk/templates/libraries/native/anyof_model.mustache
similarity index 100%
rename from templates/libraries/native/anyof_model.mustache
rename to sdk/templates/libraries/native/anyof_model.mustache
diff --git a/templates/libraries/native/api.mustache b/sdk/templates/libraries/native/api.mustache
similarity index 100%
rename from templates/libraries/native/api.mustache
rename to sdk/templates/libraries/native/api.mustache
diff --git a/templates/libraries/native/apiException.mustache b/sdk/templates/libraries/native/apiException.mustache
similarity index 100%
rename from templates/libraries/native/apiException.mustache
rename to sdk/templates/libraries/native/apiException.mustache
diff --git a/templates/libraries/native/api_doc.mustache b/sdk/templates/libraries/native/api_doc.mustache
similarity index 100%
rename from templates/libraries/native/api_doc.mustache
rename to sdk/templates/libraries/native/api_doc.mustache
diff --git a/templates/libraries/native/api_test.mustache b/sdk/templates/libraries/native/api_test.mustache
similarity index 100%
rename from templates/libraries/native/api_test.mustache
rename to sdk/templates/libraries/native/api_test.mustache
diff --git a/templates/libraries/native/build.gradle.mustache b/sdk/templates/libraries/native/build.gradle.mustache
similarity index 100%
rename from templates/libraries/native/build.gradle.mustache
rename to sdk/templates/libraries/native/build.gradle.mustache
diff --git a/templates/libraries/native/generatedAnnotation.mustache b/sdk/templates/libraries/native/generatedAnnotation.mustache
similarity index 100%
rename from templates/libraries/native/generatedAnnotation.mustache
rename to sdk/templates/libraries/native/generatedAnnotation.mustache
diff --git a/templates/libraries/native/model.mustache b/sdk/templates/libraries/native/model.mustache
similarity index 100%
rename from templates/libraries/native/model.mustache
rename to sdk/templates/libraries/native/model.mustache
diff --git a/templates/libraries/native/modelEnum.mustache b/sdk/templates/libraries/native/modelEnum.mustache
similarity index 100%
rename from templates/libraries/native/modelEnum.mustache
rename to sdk/templates/libraries/native/modelEnum.mustache
diff --git a/templates/libraries/native/model_anyof_doc.mustache b/sdk/templates/libraries/native/model_anyof_doc.mustache
similarity index 100%
rename from templates/libraries/native/model_anyof_doc.mustache
rename to sdk/templates/libraries/native/model_anyof_doc.mustache
diff --git a/templates/libraries/native/model_doc.mustache b/sdk/templates/libraries/native/model_doc.mustache
similarity index 100%
rename from templates/libraries/native/model_doc.mustache
rename to sdk/templates/libraries/native/model_doc.mustache
diff --git a/templates/libraries/native/model_oneof_doc.mustache b/sdk/templates/libraries/native/model_oneof_doc.mustache
similarity index 100%
rename from templates/libraries/native/model_oneof_doc.mustache
rename to sdk/templates/libraries/native/model_oneof_doc.mustache
diff --git a/templates/libraries/native/oneof_model.mustache b/sdk/templates/libraries/native/oneof_model.mustache
similarity index 100%
rename from templates/libraries/native/oneof_model.mustache
rename to sdk/templates/libraries/native/oneof_model.mustache
diff --git a/templates/libraries/native/pojo.mustache b/sdk/templates/libraries/native/pojo.mustache
similarity index 100%
rename from templates/libraries/native/pojo.mustache
rename to sdk/templates/libraries/native/pojo.mustache
diff --git a/templates/libraries/native/pom.mustache b/sdk/templates/libraries/native/pom.mustache
similarity index 100%
rename from templates/libraries/native/pom.mustache
rename to sdk/templates/libraries/native/pom.mustache
diff --git a/templates/libraries/native/travis.mustache b/sdk/templates/libraries/native/travis.mustache
similarity index 100%
rename from templates/libraries/native/travis.mustache
rename to sdk/templates/libraries/native/travis.mustache
diff --git a/templates/libraries/okhttp-gson/AbstractOpenApiSchema.mustache b/sdk/templates/libraries/okhttp-gson/AbstractOpenApiSchema.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/AbstractOpenApiSchema.mustache
rename to sdk/templates/libraries/okhttp-gson/AbstractOpenApiSchema.mustache
diff --git a/templates/libraries/okhttp-gson/ApiCallback.mustache b/sdk/templates/libraries/okhttp-gson/ApiCallback.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/ApiCallback.mustache
rename to sdk/templates/libraries/okhttp-gson/ApiCallback.mustache
diff --git a/templates/libraries/okhttp-gson/ApiClient.mustache b/sdk/templates/libraries/okhttp-gson/ApiClient.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/ApiClient.mustache
rename to sdk/templates/libraries/okhttp-gson/ApiClient.mustache
diff --git a/templates/libraries/okhttp-gson/ApiResponse.mustache b/sdk/templates/libraries/okhttp-gson/ApiResponse.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/ApiResponse.mustache
rename to sdk/templates/libraries/okhttp-gson/ApiResponse.mustache
diff --git a/templates/libraries/okhttp-gson/GzipRequestInterceptor.mustache b/sdk/templates/libraries/okhttp-gson/GzipRequestInterceptor.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/GzipRequestInterceptor.mustache
rename to sdk/templates/libraries/okhttp-gson/GzipRequestInterceptor.mustache
diff --git a/templates/libraries/okhttp-gson/JSON.mustache b/sdk/templates/libraries/okhttp-gson/JSON.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/JSON.mustache
rename to sdk/templates/libraries/okhttp-gson/JSON.mustache
diff --git a/templates/libraries/okhttp-gson/ProgressRequestBody.mustache b/sdk/templates/libraries/okhttp-gson/ProgressRequestBody.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/ProgressRequestBody.mustache
rename to sdk/templates/libraries/okhttp-gson/ProgressRequestBody.mustache
diff --git a/templates/libraries/okhttp-gson/ProgressResponseBody.mustache b/sdk/templates/libraries/okhttp-gson/ProgressResponseBody.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/ProgressResponseBody.mustache
rename to sdk/templates/libraries/okhttp-gson/ProgressResponseBody.mustache
diff --git a/templates/libraries/okhttp-gson/README.mustache b/sdk/templates/libraries/okhttp-gson/README.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/README.mustache
rename to sdk/templates/libraries/okhttp-gson/README.mustache
diff --git a/templates/libraries/okhttp-gson/additional_properties.mustache b/sdk/templates/libraries/okhttp-gson/additional_properties.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/additional_properties.mustache
rename to sdk/templates/libraries/okhttp-gson/additional_properties.mustache
diff --git a/templates/libraries/okhttp-gson/anyof_model.mustache b/sdk/templates/libraries/okhttp-gson/anyof_model.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/anyof_model.mustache
rename to sdk/templates/libraries/okhttp-gson/anyof_model.mustache
diff --git a/templates/libraries/okhttp-gson/api.mustache b/sdk/templates/libraries/okhttp-gson/api.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/api.mustache
rename to sdk/templates/libraries/okhttp-gson/api.mustache
diff --git a/templates/libraries/okhttp-gson/apiException.mustache b/sdk/templates/libraries/okhttp-gson/apiException.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/apiException.mustache
rename to sdk/templates/libraries/okhttp-gson/apiException.mustache
diff --git a/templates/libraries/okhttp-gson/api_doc.mustache b/sdk/templates/libraries/okhttp-gson/api_doc.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/api_doc.mustache
rename to sdk/templates/libraries/okhttp-gson/api_doc.mustache
diff --git a/templates/libraries/okhttp-gson/api_test.mustache b/sdk/templates/libraries/okhttp-gson/api_test.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/api_test.mustache
rename to sdk/templates/libraries/okhttp-gson/api_test.mustache
diff --git a/templates/libraries/okhttp-gson/auth/AWS4Auth.mustache b/sdk/templates/libraries/okhttp-gson/auth/AWS4Auth.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/AWS4Auth.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/AWS4Auth.mustache
diff --git a/templates/libraries/okhttp-gson/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/okhttp-gson/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/okhttp-gson/auth/Authentication.mustache b/sdk/templates/libraries/okhttp-gson/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/Authentication.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/Authentication.mustache
diff --git a/templates/libraries/okhttp-gson/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/okhttp-gson/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/okhttp-gson/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/okhttp-gson/auth/OAuth.mustache b/sdk/templates/libraries/okhttp-gson/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/OAuth.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/OAuth.mustache
diff --git a/templates/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache b/sdk/templates/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/OAuthOkHttpClient.mustache
diff --git a/templates/libraries/okhttp-gson/auth/RetryingOAuth.mustache b/sdk/templates/libraries/okhttp-gson/auth/RetryingOAuth.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/auth/RetryingOAuth.mustache
rename to sdk/templates/libraries/okhttp-gson/auth/RetryingOAuth.mustache
diff --git a/templates/libraries/okhttp-gson/build.gradle.mustache b/sdk/templates/libraries/okhttp-gson/build.gradle.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/build.gradle.mustache
rename to sdk/templates/libraries/okhttp-gson/build.gradle.mustache
diff --git a/templates/libraries/okhttp-gson/build.sbt.mustache b/sdk/templates/libraries/okhttp-gson/build.sbt.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/build.sbt.mustache
rename to sdk/templates/libraries/okhttp-gson/build.sbt.mustache
diff --git a/templates/libraries/okhttp-gson/model.mustache b/sdk/templates/libraries/okhttp-gson/model.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/model.mustache
rename to sdk/templates/libraries/okhttp-gson/model.mustache
diff --git a/templates/libraries/okhttp-gson/modelEnum.mustache b/sdk/templates/libraries/okhttp-gson/modelEnum.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/modelEnum.mustache
rename to sdk/templates/libraries/okhttp-gson/modelEnum.mustache
diff --git a/templates/libraries/okhttp-gson/modelInnerEnum.mustache b/sdk/templates/libraries/okhttp-gson/modelInnerEnum.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/modelInnerEnum.mustache
rename to sdk/templates/libraries/okhttp-gson/modelInnerEnum.mustache
diff --git a/templates/libraries/okhttp-gson/model_test.mustache b/sdk/templates/libraries/okhttp-gson/model_test.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/model_test.mustache
rename to sdk/templates/libraries/okhttp-gson/model_test.mustache
diff --git a/templates/libraries/okhttp-gson/oneof_model.mustache b/sdk/templates/libraries/okhttp-gson/oneof_model.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/oneof_model.mustache
rename to sdk/templates/libraries/okhttp-gson/oneof_model.mustache
diff --git a/templates/libraries/okhttp-gson/pojo.mustache b/sdk/templates/libraries/okhttp-gson/pojo.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/pojo.mustache
rename to sdk/templates/libraries/okhttp-gson/pojo.mustache
diff --git a/templates/libraries/okhttp-gson/pom.mustache b/sdk/templates/libraries/okhttp-gson/pom.mustache
similarity index 100%
rename from templates/libraries/okhttp-gson/pom.mustache
rename to sdk/templates/libraries/okhttp-gson/pom.mustache
diff --git a/templates/libraries/rest-assured/ApiClient.mustache b/sdk/templates/libraries/rest-assured/ApiClient.mustache
similarity index 100%
rename from templates/libraries/rest-assured/ApiClient.mustache
rename to sdk/templates/libraries/rest-assured/ApiClient.mustache
diff --git a/templates/libraries/rest-assured/GsonObjectMapper.mustache b/sdk/templates/libraries/rest-assured/GsonObjectMapper.mustache
similarity index 100%
rename from templates/libraries/rest-assured/GsonObjectMapper.mustache
rename to sdk/templates/libraries/rest-assured/GsonObjectMapper.mustache
diff --git a/templates/libraries/rest-assured/JacksonObjectMapper.mustache b/sdk/templates/libraries/rest-assured/JacksonObjectMapper.mustache
similarity index 100%
rename from templates/libraries/rest-assured/JacksonObjectMapper.mustache
rename to sdk/templates/libraries/rest-assured/JacksonObjectMapper.mustache
diff --git a/templates/libraries/rest-assured/Oper.mustache b/sdk/templates/libraries/rest-assured/Oper.mustache
similarity index 100%
rename from templates/libraries/rest-assured/Oper.mustache
rename to sdk/templates/libraries/rest-assured/Oper.mustache
diff --git a/templates/libraries/rest-assured/README.mustache b/sdk/templates/libraries/rest-assured/README.mustache
similarity index 100%
rename from templates/libraries/rest-assured/README.mustache
rename to sdk/templates/libraries/rest-assured/README.mustache
diff --git a/templates/libraries/rest-assured/ResponseSpecBuilders.mustache b/sdk/templates/libraries/rest-assured/ResponseSpecBuilders.mustache
similarity index 100%
rename from templates/libraries/rest-assured/ResponseSpecBuilders.mustache
rename to sdk/templates/libraries/rest-assured/ResponseSpecBuilders.mustache
diff --git a/templates/libraries/rest-assured/api.mustache b/sdk/templates/libraries/rest-assured/api.mustache
similarity index 100%
rename from templates/libraries/rest-assured/api.mustache
rename to sdk/templates/libraries/rest-assured/api.mustache
diff --git a/templates/libraries/rest-assured/api_doc.mustache b/sdk/templates/libraries/rest-assured/api_doc.mustache
similarity index 100%
rename from templates/libraries/rest-assured/api_doc.mustache
rename to sdk/templates/libraries/rest-assured/api_doc.mustache
diff --git a/templates/libraries/rest-assured/api_test.mustache b/sdk/templates/libraries/rest-assured/api_test.mustache
similarity index 100%
rename from templates/libraries/rest-assured/api_test.mustache
rename to sdk/templates/libraries/rest-assured/api_test.mustache
diff --git a/templates/libraries/rest-assured/build.gradle.mustache b/sdk/templates/libraries/rest-assured/build.gradle.mustache
similarity index 100%
rename from templates/libraries/rest-assured/build.gradle.mustache
rename to sdk/templates/libraries/rest-assured/build.gradle.mustache
diff --git a/templates/libraries/rest-assured/build.sbt.mustache b/sdk/templates/libraries/rest-assured/build.sbt.mustache
similarity index 100%
rename from templates/libraries/rest-assured/build.sbt.mustache
rename to sdk/templates/libraries/rest-assured/build.sbt.mustache
diff --git a/templates/libraries/rest-assured/pom.mustache b/sdk/templates/libraries/rest-assured/pom.mustache
similarity index 100%
rename from templates/libraries/rest-assured/pom.mustache
rename to sdk/templates/libraries/rest-assured/pom.mustache
diff --git a/templates/libraries/restclient/ApiClient.mustache b/sdk/templates/libraries/restclient/ApiClient.mustache
similarity index 100%
rename from templates/libraries/restclient/ApiClient.mustache
rename to sdk/templates/libraries/restclient/ApiClient.mustache
diff --git a/templates/libraries/restclient/README.mustache b/sdk/templates/libraries/restclient/README.mustache
similarity index 100%
rename from templates/libraries/restclient/README.mustache
rename to sdk/templates/libraries/restclient/README.mustache
diff --git a/templates/libraries/restclient/additional_properties.mustache b/sdk/templates/libraries/restclient/additional_properties.mustache
similarity index 100%
rename from templates/libraries/restclient/additional_properties.mustache
rename to sdk/templates/libraries/restclient/additional_properties.mustache
diff --git a/templates/libraries/restclient/api.mustache b/sdk/templates/libraries/restclient/api.mustache
similarity index 100%
rename from templates/libraries/restclient/api.mustache
rename to sdk/templates/libraries/restclient/api.mustache
diff --git a/templates/libraries/restclient/api_test.mustache b/sdk/templates/libraries/restclient/api_test.mustache
similarity index 100%
rename from templates/libraries/restclient/api_test.mustache
rename to sdk/templates/libraries/restclient/api_test.mustache
diff --git a/templates/libraries/restclient/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/restclient/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/restclient/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/restclient/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/restclient/auth/Authentication.mustache b/sdk/templates/libraries/restclient/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/restclient/auth/Authentication.mustache
rename to sdk/templates/libraries/restclient/auth/Authentication.mustache
diff --git a/templates/libraries/restclient/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/restclient/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/restclient/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/restclient/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/restclient/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/restclient/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/restclient/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/restclient/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/restclient/auth/OAuth.mustache b/sdk/templates/libraries/restclient/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/restclient/auth/OAuth.mustache
rename to sdk/templates/libraries/restclient/auth/OAuth.mustache
diff --git a/templates/libraries/restclient/auth/OAuthFlow.mustache b/sdk/templates/libraries/restclient/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/libraries/restclient/auth/OAuthFlow.mustache
rename to sdk/templates/libraries/restclient/auth/OAuthFlow.mustache
diff --git a/templates/libraries/restclient/build.gradle.mustache b/sdk/templates/libraries/restclient/build.gradle.mustache
similarity index 100%
rename from templates/libraries/restclient/build.gradle.mustache
rename to sdk/templates/libraries/restclient/build.gradle.mustache
diff --git a/templates/libraries/restclient/model.mustache b/sdk/templates/libraries/restclient/model.mustache
similarity index 100%
rename from templates/libraries/restclient/model.mustache
rename to sdk/templates/libraries/restclient/model.mustache
diff --git a/templates/libraries/restclient/pojo.mustache b/sdk/templates/libraries/restclient/pojo.mustache
similarity index 100%
rename from templates/libraries/restclient/pojo.mustache
rename to sdk/templates/libraries/restclient/pojo.mustache
diff --git a/templates/libraries/restclient/pom.mustache b/sdk/templates/libraries/restclient/pom.mustache
similarity index 100%
rename from templates/libraries/restclient/pom.mustache
rename to sdk/templates/libraries/restclient/pom.mustache
diff --git a/templates/libraries/restclient/single_request_parameter.mustache b/sdk/templates/libraries/restclient/single_request_parameter.mustache
similarity index 100%
rename from templates/libraries/restclient/single_request_parameter.mustache
rename to sdk/templates/libraries/restclient/single_request_parameter.mustache
diff --git a/templates/libraries/resteasy/ApiClient.mustache b/sdk/templates/libraries/resteasy/ApiClient.mustache
similarity index 100%
rename from templates/libraries/resteasy/ApiClient.mustache
rename to sdk/templates/libraries/resteasy/ApiClient.mustache
diff --git a/templates/libraries/resteasy/JSON.mustache b/sdk/templates/libraries/resteasy/JSON.mustache
similarity index 100%
rename from templates/libraries/resteasy/JSON.mustache
rename to sdk/templates/libraries/resteasy/JSON.mustache
diff --git a/templates/libraries/resteasy/api.mustache b/sdk/templates/libraries/resteasy/api.mustache
similarity index 100%
rename from templates/libraries/resteasy/api.mustache
rename to sdk/templates/libraries/resteasy/api.mustache
diff --git a/templates/libraries/resteasy/build.gradle.mustache b/sdk/templates/libraries/resteasy/build.gradle.mustache
similarity index 100%
rename from templates/libraries/resteasy/build.gradle.mustache
rename to sdk/templates/libraries/resteasy/build.gradle.mustache
diff --git a/templates/libraries/resteasy/build.sbt.mustache b/sdk/templates/libraries/resteasy/build.sbt.mustache
similarity index 100%
rename from templates/libraries/resteasy/build.sbt.mustache
rename to sdk/templates/libraries/resteasy/build.sbt.mustache
diff --git a/templates/libraries/resteasy/pom.mustache b/sdk/templates/libraries/resteasy/pom.mustache
similarity index 100%
rename from templates/libraries/resteasy/pom.mustache
rename to sdk/templates/libraries/resteasy/pom.mustache
diff --git a/templates/libraries/resttemplate/ApiClient.mustache b/sdk/templates/libraries/resttemplate/ApiClient.mustache
similarity index 100%
rename from templates/libraries/resttemplate/ApiClient.mustache
rename to sdk/templates/libraries/resttemplate/ApiClient.mustache
diff --git a/templates/libraries/resttemplate/BaseApi.mustache b/sdk/templates/libraries/resttemplate/BaseApi.mustache
similarity index 100%
rename from templates/libraries/resttemplate/BaseApi.mustache
rename to sdk/templates/libraries/resttemplate/BaseApi.mustache
diff --git a/templates/libraries/resttemplate/additional_properties.mustache b/sdk/templates/libraries/resttemplate/additional_properties.mustache
similarity index 100%
rename from templates/libraries/resttemplate/additional_properties.mustache
rename to sdk/templates/libraries/resttemplate/additional_properties.mustache
diff --git a/templates/libraries/resttemplate/api.mustache b/sdk/templates/libraries/resttemplate/api.mustache
similarity index 100%
rename from templates/libraries/resttemplate/api.mustache
rename to sdk/templates/libraries/resttemplate/api.mustache
diff --git a/templates/libraries/resttemplate/api_test.mustache b/sdk/templates/libraries/resttemplate/api_test.mustache
similarity index 100%
rename from templates/libraries/resttemplate/api_test.mustache
rename to sdk/templates/libraries/resttemplate/api_test.mustache
diff --git a/templates/libraries/resttemplate/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/resttemplate/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/resttemplate/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/resttemplate/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/resttemplate/auth/Authentication.mustache b/sdk/templates/libraries/resttemplate/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/resttemplate/auth/Authentication.mustache
rename to sdk/templates/libraries/resttemplate/auth/Authentication.mustache
diff --git a/templates/libraries/resttemplate/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/resttemplate/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/resttemplate/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/resttemplate/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/resttemplate/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/resttemplate/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/resttemplate/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/resttemplate/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/resttemplate/auth/OAuth.mustache b/sdk/templates/libraries/resttemplate/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/resttemplate/auth/OAuth.mustache
rename to sdk/templates/libraries/resttemplate/auth/OAuth.mustache
diff --git a/templates/libraries/resttemplate/auth/OAuthFlow.mustache b/sdk/templates/libraries/resttemplate/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/libraries/resttemplate/auth/OAuthFlow.mustache
rename to sdk/templates/libraries/resttemplate/auth/OAuthFlow.mustache
diff --git a/templates/libraries/resttemplate/build.gradle.mustache b/sdk/templates/libraries/resttemplate/build.gradle.mustache
similarity index 100%
rename from templates/libraries/resttemplate/build.gradle.mustache
rename to sdk/templates/libraries/resttemplate/build.gradle.mustache
diff --git a/templates/libraries/resttemplate/model.mustache b/sdk/templates/libraries/resttemplate/model.mustache
similarity index 100%
rename from templates/libraries/resttemplate/model.mustache
rename to sdk/templates/libraries/resttemplate/model.mustache
diff --git a/templates/libraries/resttemplate/pojo.mustache b/sdk/templates/libraries/resttemplate/pojo.mustache
similarity index 100%
rename from templates/libraries/resttemplate/pojo.mustache
rename to sdk/templates/libraries/resttemplate/pojo.mustache
diff --git a/templates/libraries/resttemplate/pom.mustache b/sdk/templates/libraries/resttemplate/pom.mustache
similarity index 100%
rename from templates/libraries/resttemplate/pom.mustache
rename to sdk/templates/libraries/resttemplate/pom.mustache
diff --git a/templates/libraries/retrofit2/ApiClient.mustache b/sdk/templates/libraries/retrofit2/ApiClient.mustache
similarity index 100%
rename from templates/libraries/retrofit2/ApiClient.mustache
rename to sdk/templates/libraries/retrofit2/ApiClient.mustache
diff --git a/templates/libraries/retrofit2/CollectionFormats.mustache b/sdk/templates/libraries/retrofit2/CollectionFormats.mustache
similarity index 100%
rename from templates/libraries/retrofit2/CollectionFormats.mustache
rename to sdk/templates/libraries/retrofit2/CollectionFormats.mustache
diff --git a/templates/libraries/retrofit2/JSON.mustache b/sdk/templates/libraries/retrofit2/JSON.mustache
similarity index 100%
rename from templates/libraries/retrofit2/JSON.mustache
rename to sdk/templates/libraries/retrofit2/JSON.mustache
diff --git a/templates/libraries/retrofit2/JSON_jackson.mustache b/sdk/templates/libraries/retrofit2/JSON_jackson.mustache
similarity index 100%
rename from templates/libraries/retrofit2/JSON_jackson.mustache
rename to sdk/templates/libraries/retrofit2/JSON_jackson.mustache
diff --git a/templates/libraries/retrofit2/README.mustache b/sdk/templates/libraries/retrofit2/README.mustache
similarity index 100%
rename from templates/libraries/retrofit2/README.mustache
rename to sdk/templates/libraries/retrofit2/README.mustache
diff --git a/templates/libraries/retrofit2/api.mustache b/sdk/templates/libraries/retrofit2/api.mustache
similarity index 100%
rename from templates/libraries/retrofit2/api.mustache
rename to sdk/templates/libraries/retrofit2/api.mustache
diff --git a/templates/libraries/retrofit2/api_test.mustache b/sdk/templates/libraries/retrofit2/api_test.mustache
similarity index 100%
rename from templates/libraries/retrofit2/api_test.mustache
rename to sdk/templates/libraries/retrofit2/api_test.mustache
diff --git a/templates/libraries/retrofit2/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/retrofit2/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/retrofit2/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/retrofit2/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/retrofit2/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/retrofit2/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/retrofit2/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/retrofit2/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/retrofit2/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/retrofit2/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/retrofit2/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/retrofit2/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/retrofit2/auth/OAuth.mustache b/sdk/templates/libraries/retrofit2/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/retrofit2/auth/OAuth.mustache
rename to sdk/templates/libraries/retrofit2/auth/OAuth.mustache
diff --git a/templates/libraries/retrofit2/auth/OAuthOkHttpClient.mustache b/sdk/templates/libraries/retrofit2/auth/OAuthOkHttpClient.mustache
similarity index 100%
rename from templates/libraries/retrofit2/auth/OAuthOkHttpClient.mustache
rename to sdk/templates/libraries/retrofit2/auth/OAuthOkHttpClient.mustache
diff --git a/templates/libraries/retrofit2/bodyParams.mustache b/sdk/templates/libraries/retrofit2/bodyParams.mustache
similarity index 100%
rename from templates/libraries/retrofit2/bodyParams.mustache
rename to sdk/templates/libraries/retrofit2/bodyParams.mustache
diff --git a/templates/libraries/retrofit2/build.gradle.mustache b/sdk/templates/libraries/retrofit2/build.gradle.mustache
similarity index 100%
rename from templates/libraries/retrofit2/build.gradle.mustache
rename to sdk/templates/libraries/retrofit2/build.gradle.mustache
diff --git a/templates/libraries/retrofit2/build.sbt.mustache b/sdk/templates/libraries/retrofit2/build.sbt.mustache
similarity index 100%
rename from templates/libraries/retrofit2/build.sbt.mustache
rename to sdk/templates/libraries/retrofit2/build.sbt.mustache
diff --git a/templates/libraries/retrofit2/formParams.mustache b/sdk/templates/libraries/retrofit2/formParams.mustache
similarity index 100%
rename from templates/libraries/retrofit2/formParams.mustache
rename to sdk/templates/libraries/retrofit2/formParams.mustache
diff --git a/templates/libraries/retrofit2/formParams.mustache.save b/sdk/templates/libraries/retrofit2/formParams.mustache.save
similarity index 100%
rename from templates/libraries/retrofit2/formParams.mustache.save
rename to sdk/templates/libraries/retrofit2/formParams.mustache.save
diff --git a/templates/libraries/retrofit2/headerParams.mustache b/sdk/templates/libraries/retrofit2/headerParams.mustache
similarity index 100%
rename from templates/libraries/retrofit2/headerParams.mustache
rename to sdk/templates/libraries/retrofit2/headerParams.mustache
diff --git a/templates/libraries/retrofit2/pathParams.mustache b/sdk/templates/libraries/retrofit2/pathParams.mustache
similarity index 100%
rename from templates/libraries/retrofit2/pathParams.mustache
rename to sdk/templates/libraries/retrofit2/pathParams.mustache
diff --git a/templates/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/retrofit2/play-common/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/retrofit2/play24/ApiClient.mustache b/sdk/templates/libraries/retrofit2/play24/ApiClient.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play24/ApiClient.mustache
rename to sdk/templates/libraries/retrofit2/play24/ApiClient.mustache
diff --git a/templates/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache b/sdk/templates/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
rename to sdk/templates/libraries/retrofit2/play24/Play24CallAdapterFactory.mustache
diff --git a/templates/libraries/retrofit2/play24/Play24CallFactory.mustache b/sdk/templates/libraries/retrofit2/play24/Play24CallFactory.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play24/Play24CallFactory.mustache
rename to sdk/templates/libraries/retrofit2/play24/Play24CallFactory.mustache
diff --git a/templates/libraries/retrofit2/play24/api.mustache b/sdk/templates/libraries/retrofit2/play24/api.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play24/api.mustache
rename to sdk/templates/libraries/retrofit2/play24/api.mustache
diff --git a/templates/libraries/retrofit2/play25/ApiClient.mustache b/sdk/templates/libraries/retrofit2/play25/ApiClient.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play25/ApiClient.mustache
rename to sdk/templates/libraries/retrofit2/play25/ApiClient.mustache
diff --git a/templates/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache b/sdk/templates/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache
rename to sdk/templates/libraries/retrofit2/play25/Play25CallAdapterFactory.mustache
diff --git a/templates/libraries/retrofit2/play25/Play25CallFactory.mustache b/sdk/templates/libraries/retrofit2/play25/Play25CallFactory.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play25/Play25CallFactory.mustache
rename to sdk/templates/libraries/retrofit2/play25/Play25CallFactory.mustache
diff --git a/templates/libraries/retrofit2/play25/api.mustache b/sdk/templates/libraries/retrofit2/play25/api.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play25/api.mustache
rename to sdk/templates/libraries/retrofit2/play25/api.mustache
diff --git a/templates/libraries/retrofit2/play26/ApiClient.mustache b/sdk/templates/libraries/retrofit2/play26/ApiClient.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play26/ApiClient.mustache
rename to sdk/templates/libraries/retrofit2/play26/ApiClient.mustache
diff --git a/templates/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache b/sdk/templates/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache
rename to sdk/templates/libraries/retrofit2/play26/Play26CallAdapterFactory.mustache
diff --git a/templates/libraries/retrofit2/play26/Play26CallFactory.mustache b/sdk/templates/libraries/retrofit2/play26/Play26CallFactory.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play26/Play26CallFactory.mustache
rename to sdk/templates/libraries/retrofit2/play26/Play26CallFactory.mustache
diff --git a/templates/libraries/retrofit2/play26/api.mustache b/sdk/templates/libraries/retrofit2/play26/api.mustache
similarity index 100%
rename from templates/libraries/retrofit2/play26/api.mustache
rename to sdk/templates/libraries/retrofit2/play26/api.mustache
diff --git a/templates/libraries/retrofit2/pom.mustache b/sdk/templates/libraries/retrofit2/pom.mustache
similarity index 100%
rename from templates/libraries/retrofit2/pom.mustache
rename to sdk/templates/libraries/retrofit2/pom.mustache
diff --git a/templates/libraries/retrofit2/queryParams.mustache b/sdk/templates/libraries/retrofit2/queryParams.mustache
similarity index 100%
rename from templates/libraries/retrofit2/queryParams.mustache
rename to sdk/templates/libraries/retrofit2/queryParams.mustache
diff --git a/templates/libraries/vertx/ApiClient.mustache b/sdk/templates/libraries/vertx/ApiClient.mustache
similarity index 100%
rename from templates/libraries/vertx/ApiClient.mustache
rename to sdk/templates/libraries/vertx/ApiClient.mustache
diff --git a/templates/libraries/vertx/Configuration.mustache b/sdk/templates/libraries/vertx/Configuration.mustache
similarity index 100%
rename from templates/libraries/vertx/Configuration.mustache
rename to sdk/templates/libraries/vertx/Configuration.mustache
diff --git a/templates/libraries/vertx/api.mustache b/sdk/templates/libraries/vertx/api.mustache
similarity index 100%
rename from templates/libraries/vertx/api.mustache
rename to sdk/templates/libraries/vertx/api.mustache
diff --git a/templates/libraries/vertx/apiException.mustache b/sdk/templates/libraries/vertx/apiException.mustache
similarity index 100%
rename from templates/libraries/vertx/apiException.mustache
rename to sdk/templates/libraries/vertx/apiException.mustache
diff --git a/templates/libraries/vertx/apiImpl.mustache b/sdk/templates/libraries/vertx/apiImpl.mustache
similarity index 100%
rename from templates/libraries/vertx/apiImpl.mustache
rename to sdk/templates/libraries/vertx/apiImpl.mustache
diff --git a/templates/libraries/vertx/api_test.mustache b/sdk/templates/libraries/vertx/api_test.mustache
similarity index 100%
rename from templates/libraries/vertx/api_test.mustache
rename to sdk/templates/libraries/vertx/api_test.mustache
diff --git a/templates/libraries/vertx/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/vertx/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/vertx/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/vertx/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/vertx/auth/Authentication.mustache b/sdk/templates/libraries/vertx/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/vertx/auth/Authentication.mustache
rename to sdk/templates/libraries/vertx/auth/Authentication.mustache
diff --git a/templates/libraries/vertx/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/vertx/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/vertx/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/vertx/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/vertx/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/vertx/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/vertx/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/vertx/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/vertx/auth/OAuth.mustache b/sdk/templates/libraries/vertx/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/vertx/auth/OAuth.mustache
rename to sdk/templates/libraries/vertx/auth/OAuth.mustache
diff --git a/templates/libraries/vertx/auth/OAuthFlow.mustache b/sdk/templates/libraries/vertx/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/libraries/vertx/auth/OAuthFlow.mustache
rename to sdk/templates/libraries/vertx/auth/OAuthFlow.mustache
diff --git a/templates/libraries/vertx/build.gradle.mustache b/sdk/templates/libraries/vertx/build.gradle.mustache
similarity index 100%
rename from templates/libraries/vertx/build.gradle.mustache
rename to sdk/templates/libraries/vertx/build.gradle.mustache
diff --git a/templates/libraries/vertx/pom.mustache b/sdk/templates/libraries/vertx/pom.mustache
similarity index 100%
rename from templates/libraries/vertx/pom.mustache
rename to sdk/templates/libraries/vertx/pom.mustache
diff --git a/templates/libraries/vertx/rxApiImpl.mustache b/sdk/templates/libraries/vertx/rxApiImpl.mustache
similarity index 100%
rename from templates/libraries/vertx/rxApiImpl.mustache
rename to sdk/templates/libraries/vertx/rxApiImpl.mustache
diff --git a/templates/libraries/webclient/ApiClient.mustache b/sdk/templates/libraries/webclient/ApiClient.mustache
similarity index 100%
rename from templates/libraries/webclient/ApiClient.mustache
rename to sdk/templates/libraries/webclient/ApiClient.mustache
diff --git a/templates/libraries/webclient/additional_properties.mustache b/sdk/templates/libraries/webclient/additional_properties.mustache
similarity index 100%
rename from templates/libraries/webclient/additional_properties.mustache
rename to sdk/templates/libraries/webclient/additional_properties.mustache
diff --git a/templates/libraries/webclient/api.mustache b/sdk/templates/libraries/webclient/api.mustache
similarity index 100%
rename from templates/libraries/webclient/api.mustache
rename to sdk/templates/libraries/webclient/api.mustache
diff --git a/templates/libraries/webclient/api_test.mustache b/sdk/templates/libraries/webclient/api_test.mustache
similarity index 100%
rename from templates/libraries/webclient/api_test.mustache
rename to sdk/templates/libraries/webclient/api_test.mustache
diff --git a/templates/libraries/webclient/auth/ApiKeyAuth.mustache b/sdk/templates/libraries/webclient/auth/ApiKeyAuth.mustache
similarity index 100%
rename from templates/libraries/webclient/auth/ApiKeyAuth.mustache
rename to sdk/templates/libraries/webclient/auth/ApiKeyAuth.mustache
diff --git a/templates/libraries/webclient/auth/Authentication.mustache b/sdk/templates/libraries/webclient/auth/Authentication.mustache
similarity index 100%
rename from templates/libraries/webclient/auth/Authentication.mustache
rename to sdk/templates/libraries/webclient/auth/Authentication.mustache
diff --git a/templates/libraries/webclient/auth/HttpBasicAuth.mustache b/sdk/templates/libraries/webclient/auth/HttpBasicAuth.mustache
similarity index 100%
rename from templates/libraries/webclient/auth/HttpBasicAuth.mustache
rename to sdk/templates/libraries/webclient/auth/HttpBasicAuth.mustache
diff --git a/templates/libraries/webclient/auth/HttpBearerAuth.mustache b/sdk/templates/libraries/webclient/auth/HttpBearerAuth.mustache
similarity index 100%
rename from templates/libraries/webclient/auth/HttpBearerAuth.mustache
rename to sdk/templates/libraries/webclient/auth/HttpBearerAuth.mustache
diff --git a/templates/libraries/webclient/auth/OAuth.mustache b/sdk/templates/libraries/webclient/auth/OAuth.mustache
similarity index 100%
rename from templates/libraries/webclient/auth/OAuth.mustache
rename to sdk/templates/libraries/webclient/auth/OAuth.mustache
diff --git a/templates/libraries/webclient/auth/OAuthFlow.mustache b/sdk/templates/libraries/webclient/auth/OAuthFlow.mustache
similarity index 100%
rename from templates/libraries/webclient/auth/OAuthFlow.mustache
rename to sdk/templates/libraries/webclient/auth/OAuthFlow.mustache
diff --git a/templates/libraries/webclient/build.gradle.mustache b/sdk/templates/libraries/webclient/build.gradle.mustache
similarity index 100%
rename from templates/libraries/webclient/build.gradle.mustache
rename to sdk/templates/libraries/webclient/build.gradle.mustache
diff --git a/templates/libraries/webclient/model.mustache b/sdk/templates/libraries/webclient/model.mustache
similarity index 100%
rename from templates/libraries/webclient/model.mustache
rename to sdk/templates/libraries/webclient/model.mustache
diff --git a/templates/libraries/webclient/pojo.mustache b/sdk/templates/libraries/webclient/pojo.mustache
similarity index 100%
rename from templates/libraries/webclient/pojo.mustache
rename to sdk/templates/libraries/webclient/pojo.mustache
diff --git a/templates/libraries/webclient/pom.mustache b/sdk/templates/libraries/webclient/pom.mustache
similarity index 100%
rename from templates/libraries/webclient/pom.mustache
rename to sdk/templates/libraries/webclient/pom.mustache
diff --git a/templates/libraries/webclient/single_request_parameter.mustache b/sdk/templates/libraries/webclient/single_request_parameter.mustache
similarity index 100%
rename from templates/libraries/webclient/single_request_parameter.mustache
rename to sdk/templates/libraries/webclient/single_request_parameter.mustache
diff --git a/templates/licenseInfo.mustache b/sdk/templates/licenseInfo.mustache
similarity index 100%
rename from templates/licenseInfo.mustache
rename to sdk/templates/licenseInfo.mustache
diff --git a/templates/manifest.mustache b/sdk/templates/manifest.mustache
similarity index 100%
rename from templates/manifest.mustache
rename to sdk/templates/manifest.mustache
diff --git a/templates/maven.yml.mustache b/sdk/templates/maven.yml.mustache
similarity index 100%
rename from templates/maven.yml.mustache
rename to sdk/templates/maven.yml.mustache
diff --git a/templates/model.mustache b/sdk/templates/model.mustache
similarity index 100%
rename from templates/model.mustache
rename to sdk/templates/model.mustache
diff --git a/templates/modelEnum.mustache b/sdk/templates/modelEnum.mustache
similarity index 100%
rename from templates/modelEnum.mustache
rename to sdk/templates/modelEnum.mustache
diff --git a/templates/modelInnerEnum.mustache b/sdk/templates/modelInnerEnum.mustache
similarity index 100%
rename from templates/modelInnerEnum.mustache
rename to sdk/templates/modelInnerEnum.mustache
diff --git a/templates/model_doc.mustache b/sdk/templates/model_doc.mustache
similarity index 100%
rename from templates/model_doc.mustache
rename to sdk/templates/model_doc.mustache
diff --git a/templates/model_test.mustache b/sdk/templates/model_test.mustache
similarity index 100%
rename from templates/model_test.mustache
rename to sdk/templates/model_test.mustache
diff --git a/templates/nullable_var_annotations.mustache b/sdk/templates/nullable_var_annotations.mustache
similarity index 100%
rename from templates/nullable_var_annotations.mustache
rename to sdk/templates/nullable_var_annotations.mustache
diff --git a/templates/oneof_interface.mustache b/sdk/templates/oneof_interface.mustache
similarity index 100%
rename from templates/oneof_interface.mustache
rename to sdk/templates/oneof_interface.mustache
diff --git a/templates/openapi.mustache b/sdk/templates/openapi.mustache
similarity index 100%
rename from templates/openapi.mustache
rename to sdk/templates/openapi.mustache
diff --git a/templates/permits.mustache b/sdk/templates/permits.mustache
similarity index 100%
rename from templates/permits.mustache
rename to sdk/templates/permits.mustache
diff --git a/templates/pojo.mustache b/sdk/templates/pojo.mustache
similarity index 100%
rename from templates/pojo.mustache
rename to sdk/templates/pojo.mustache
diff --git a/templates/pojo_doc.mustache b/sdk/templates/pojo_doc.mustache
similarity index 100%
rename from templates/pojo_doc.mustache
rename to sdk/templates/pojo_doc.mustache
diff --git a/templates/pom.mustache b/sdk/templates/pom.mustache
similarity index 54%
rename from templates/pom.mustache
rename to sdk/templates/pom.mustache
index 56f96ae5..f7012622 100644
--- a/templates/pom.mustache
+++ b/sdk/templates/pom.mustache
@@ -221,184 +221,95 @@
         </profile>
     </profiles>
 
+<dependencyManagement>
     <dependencies>
-        {{#swagger1AnnotationLibrary}}
         <dependency>
-            <groupId>io.swagger</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-        {{/swagger1AnnotationLibrary}}
-        {{#swagger2AnnotationLibrary}}
-        <dependency>
-            <groupId>io.swagger.core.v3</groupId>
-            <artifactId>swagger-annotations</artifactId>
-            <version>${swagger-annotations-version}</version>
-        </dependency>
-        {{/swagger2AnnotationLibrary}}
-
-        <!-- @Nullable annotation -->
-        <dependency>
-            <groupId>com.google.code.findbugs</groupId>
-            <artifactId>jsr305</artifactId>
-            <version>3.0.2</version>
-        </dependency>
-
-
-        <!-- HTTP client: jersey-client -->
-        <dependency>
-            <groupId>com.sun.jersey</groupId>
-            <artifactId>jersey-client</artifactId>
-            <version>${jersey-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.sun.jersey.contribs</groupId>
-            <artifactId>jersey-multipart</artifactId>
-            <version>${jersey-version}</version>
+            <groupId>io.github.outscale</groupId>
+            <artifactId>osc-sdk-java-sbom</artifactId>
+            <version>${project.version}</version>
+            <type>pom</type>
+            <scope>import</scope>
         </dependency>
+    </dependencies>
+</dependencyManagement>
 
-        <!-- JSON processing: jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-core</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-annotations</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.core</groupId>
-            <artifactId>jackson-databind</artifactId>
-            <version>${jackson-databind-version}</version>
-        </dependency>
-        {{^useJakartaEe}}
-        <dependency>
-            <groupId>com.fasterxml.jackson.jaxrs</groupId>
-            <artifactId>jackson-jaxrs-json-provider</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        {{/useJakartaEe}}
-        {{#useJakartaEe}}
-        <dependency>
-            <groupId>com.fasterxml.jackson.jakarta.rs</groupId>
-            <artifactId>jackson-jakarta-rs-json-provider</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-        {{/useJakartaEe}}
-        {{#withXml}}
-
-        <!-- XML processing: Jackson -->
-        <dependency>
-            <groupId>com.fasterxml.jackson.dataformat</groupId>
-            <artifactId>jackson-dataformat-xml</artifactId>
-            <version>${jackson-version}</version>
-        </dependency>
-
-        {{/withXml}}
-        {{#joda}}
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-joda</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-        {{/joda}}
-            <dependency>
-                <groupId>com.fasterxml.jackson.datatype</groupId>
-                <artifactId>jackson-datatype-jsr310</artifactId>
-                <version>${jackson-version}</version>
-            </dependency>
-        {{#useBeanValidation}}
-            <!-- Bean Validation API support -->
-            <dependency>
-                <groupId>jakarta.validation</groupId>
-                <artifactId>jakarta.validation-api</artifactId>
-                <version>${beanvalidation-version}</version>
-                <scope>provided</scope>
-            </dependency>
-        {{/useBeanValidation}}
-        {{#performBeanValidation}}
-            <!-- Bean Validation Impl. used to perform BeanValidation -->
-            <dependency>
-                <groupId>org.hibernate</groupId>
-                <artifactId>hibernate-validator</artifactId>
-                <version>5.4.1.Final</version>
-            </dependency>
-        {{/performBeanValidation}}
-        {{#parcelableModel}}
-            <!-- Needed for Parcelable support-->
-            <dependency>
-                <groupId>com.google.android</groupId>
-                <artifactId>android</artifactId>
-                <version>4.1.1.4</version>
-                <scope>provided</scope>
-            </dependency>
-        {{/parcelableModel}}
-        <dependency>
-            <groupId>jakarta.annotation</groupId>
-            <artifactId>jakarta.annotation-api</artifactId>
-            <version>${jakarta-annotation-version}</version>
-            <scope>provided</scope>
-        </dependency>
-        {{#useReflectionEqualsHashCode}}
-        <!-- For equals and hashCode using reflection -->
-        <dependency>
-            <groupId>org.apache.commons</groupId>
-            <artifactId>commons-lang3</artifactId>
-            <version>${commons-lang3-version}</version>
-        </dependency>
-        {{/useReflectionEqualsHashCode}}
-
-        <!-- test dependencies -->
-        <dependency>
-            <groupId>org.junit.jupiter</groupId>
-            <artifactId>junit-jupiter-engine</artifactId>
-            <version>${junit-version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.junit.platform</groupId>
-            <artifactId>junit-platform-runner</artifactId>
-            <version>${junit-platform-runner.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe</artifactId>
-            <version>${failsafe-version}</version>
-        </dependency>
-        <dependency>
-            <groupId>dev.failsafe</groupId>
-            <artifactId>failsafe-okhttp</artifactId>
-            <version>${failsafe-version}</version>
-        </dependency>
+<dependencies>  
+    <dependency>
+        <groupId>com.google.code.findbugs</groupId>
+        <artifactId>jsr305</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>logging-interceptor</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.google.code.gson</groupId>
+        <artifactId>gson</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>io.gsonfire</groupId>
+        <artifactId>gson-fire</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-lang3</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>jakarta.annotation</groupId>
+        <artifactId>jakarta.annotation-api</artifactId>
+        <scope>provided</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.openapitools</groupId>
+        <artifactId>jackson-databind-nullable</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>javax.annotation</groupId>
+        <artifactId>javax.annotation-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>software.amazon.awssdk</groupId>
+        <artifactId>auth</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>javax.ws.rs</groupId>
+        <artifactId>javax.ws.rs-api</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>dev.failsafe</groupId>
+        <artifactId>failsafe</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>dev.failsafe</groupId>
+        <artifactId>failsafe-okhttp</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.jupiter</groupId>
+        <artifactId>junit-jupiter-engine</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.junit.platform</groupId>
+        <artifactId>junit-platform-runner</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.mockito</groupId>
+        <artifactId>mockito-core</artifactId>
+        <scope>test</scope>
+    </dependency>
+    <dependency>
+        <groupId>org.bouncycastle</groupId>
+        <artifactId>bcpkix-jdk15on</artifactId>
+    </dependency>
+    <dependency>
+        <groupId>com.squareup.okhttp3</groupId>
+        <artifactId>okhttp-tls</artifactId>
+    </dependency>
 </dependencies>
-    <properties>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        {{#swagger1AnnotationLibrary}}
-        <swagger-annotations-version>1.6.6</swagger-annotations-version>
-        {{/swagger1AnnotationLibrary}}
-        {{#swagger2AnnotationLibrary}}
-        <swagger-annotations-version>2.2.15</swagger-annotations-version>
-        {{/swagger2AnnotationLibrary}}
-        <jersey-version>1.19.4</jersey-version>
-        <jackson-version>2.17.1</jackson-version>
-        <jackson-databind-version>2.17.1</jackson-databind-version>
-        {{#useJakartaEe}}
-        <jakarta-annotation-version>2.1.1</jakarta-annotation-version>
-        <beanvalidation-version>3.0.2</beanvalidation-version>
-        {{/useJakartaEe}}
-        {{^useJakartaEe}}
-        <jakarta-annotation-version>1.3.5</jakarta-annotation-version>
-        <beanvalidation-version>2.0.2</beanvalidation-version>
-        {{/useJakartaEe}}
-        {{#useReflectionEqualsHashCode}}
-        <commons-lang3-version>3.17.0</commons-lang3-version>
-        {{/useReflectionEqualsHashCode}}
-        <maven-plugin-version>1.0.0</maven-plugin-version>
-        <junit-version>5.10.2</junit-version>
-        <junit-platform-runner.version>1.10.0</junit-platform-runner.version>
-        <failsafe-version>3.3.1</failsafe-version>
-    </properties>
+
 </project>
diff --git a/templates/sealed.mustache b/sdk/templates/sealed.mustache
similarity index 100%
rename from templates/sealed.mustache
rename to sdk/templates/sealed.mustache
diff --git a/templates/settings.gradle.mustache b/sdk/templates/settings.gradle.mustache
similarity index 100%
rename from templates/settings.gradle.mustache
rename to sdk/templates/settings.gradle.mustache
diff --git a/templates/toto.mustache b/sdk/templates/toto.mustache
similarity index 100%
rename from templates/toto.mustache
rename to sdk/templates/toto.mustache
diff --git a/templates/travis.mustache b/sdk/templates/travis.mustache
similarity index 100%
rename from templates/travis.mustache
rename to sdk/templates/travis.mustache
diff --git a/templates/typeInfoAnnotation.mustache b/sdk/templates/typeInfoAnnotation.mustache
similarity index 100%
rename from templates/typeInfoAnnotation.mustache
rename to sdk/templates/typeInfoAnnotation.mustache
diff --git a/templates/xmlAnnotation.mustache b/sdk/templates/xmlAnnotation.mustache
similarity index 100%
rename from templates/xmlAnnotation.mustache
rename to sdk/templates/xmlAnnotation.mustache