diff --git a/bom/pom.xml b/bom/pom.xml
index fb71a9f..9b1cae8 100644
--- a/bom/pom.xml
+++ b/bom/pom.xml
@@ -89,6 +89,11 @@
 				<artifactId>tdlight-java</artifactId>
 				<version>${revision}</version>
 			</dependency>
+			<dependency>
+				<groupId>it.tdlight</groupId>
+				<artifactId>tdlight-java-8</artifactId>
+				<version>${revision}</version>
+			</dependency>
 			<dependency>
 				<groupId>it.tdlight</groupId>
 				<artifactId>tdlib-java</artifactId>
diff --git a/parent/pom.xml b/parent/pom.xml
index 51b67df..b26729f 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -15,7 +15,8 @@
 	</properties>
 	<modules>
 		<!--disabled: <module>../tdlib</module>-->
-		<module>../tdlight</module>
+		<module>../tdlight-java</module>
+		<module>../tdlight-java-8</module>
 	</modules>
 
 	<build>
diff --git a/scripts/core/deploy_release.sh b/scripts/core/deploy_release.sh
index 1f8eb6a..10d5014 100755
--- a/scripts/core/deploy_release.sh
+++ b/scripts/core/deploy_release.sh
@@ -11,8 +11,7 @@ fi
 cd "../../"
 
 cd "bom"
-mvn -B -Drevision="${REVISION}" -Dtdlight.build.type=legacy clean deploy
-mvn -B -Drevision="${REVISION}" -Dtdlight.build.type=standard clean deploy
+mvn -B -Drevision="${REVISION}" clean deploy
 cd "../"
 
 echo "Done."
diff --git a/scripts/core/deploy_snapshot.sh b/scripts/core/deploy_snapshot.sh
index 6bf8c82..4a3d805 100755
--- a/scripts/core/deploy_snapshot.sh
+++ b/scripts/core/deploy_snapshot.sh
@@ -4,7 +4,7 @@
 cd "../../"
 
 cd "bom"
-mvn -B clean deploy -Dtdlight.build.type=standard
+mvn -B clean deploy
 cd "../"
 
 echo "Done."
diff --git a/scripts/core/only_compile_release.sh b/scripts/core/only_compile_release.sh
index dcdd565..1fdcfc6 100755
--- a/scripts/core/only_compile_release.sh
+++ b/scripts/core/only_compile_release.sh
@@ -4,8 +4,7 @@
 cd "../../"
 
 cd "bom"
-mvn -B -Dtdlight.build.type=legacy clean package
-mvn -B -Dtdlight.build.type=standard clean package
+mvn -B clean package
 cd "../"
 
 echo "Done."
diff --git a/tdlight/.gitignore b/tdlight-java-8/.gitignore
similarity index 100%
rename from tdlight/.gitignore
rename to tdlight-java-8/.gitignore
diff --git a/tdlight-java-8/pom.xml b/tdlight-java-8/pom.xml
new file mode 100644
index 0000000..c34ce51
--- /dev/null
+++ b/tdlight-java-8/pom.xml
@@ -0,0 +1,345 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<modelVersion>4.0.0</modelVersion>
+	<artifactId>tdlight-java-8</artifactId>
+	<name>TDLight Java Legacy Wrapper</name>
+	<packaging>jar</packaging>
+	<parent>
+		<groupId>it.tdlight</groupId>
+		<version>${revision}</version>
+		<artifactId>tdlight-java-parent</artifactId>
+		<relativePath>../parent/pom.xml</relativePath>
+	</parent>
+	<properties>
+		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+		<revision>1.0.0.0-SNAPSHOT</revision>
+	</properties>
+	<repositories>
+		<repository>
+			<id>mchv-release</id>
+			<name>MCHV Release Apache Maven Packages</name>
+			<url>https://mvn.mchv.eu/repository/mchv</url>
+		</repository>
+		<repository>
+			<id>mchv-snapshot</id>
+			<name>MCHV Snapshot Apache Maven Packages</name>
+			<url>https://mvn.mchv.eu/repository/mchv-snapshot</url>
+		</repository>
+	</repositories>
+	<distributionManagement>
+		<repository>
+			<id>mchv-release-distribution</id>
+			<name>MCHV Release Apache Maven Packages Distribution</name>
+			<url>https://mvn.mchv.eu/repository/mchv</url>
+		</repository>
+		<snapshotRepository>
+			<id>mchv-snapshot-distribution</id>
+			<name>MCHV Snapshot Apache Maven Packages Distribution</name>
+			<url>https://mvn.mchv.eu/repository/mchv-snapshot</url>
+		</snapshotRepository>
+	</distributionManagement>
+	<scm>
+		<connection>scm:git:https://git.ignuranza.net/tdlight-team/tdlight-java.git</connection>
+		<developerConnection>scm:git:https://git.ignuranza.net/tdlight-team/tdlight-java.git</developerConnection>
+		<tag>HEAD</tag>
+	</scm>
+	<dependencies>
+		<dependency>
+			<groupId>it.tdlight</groupId>
+			<artifactId>tdlight-api-legacy</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>it.unimi.dsi</groupId>
+			<artifactId>fastutil-core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>2.0.5</version>
+		</dependency>
+		<dependency>
+			<groupId>org.reactivestreams</groupId>
+			<artifactId>reactive-streams</artifactId>
+			<version>1.0.4</version>
+		</dependency>
+		<dependency>
+			<groupId>net.harawata</groupId>
+			<artifactId>appdirs</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>com.google.zxing</groupId>
+			<artifactId>core</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>5.9.0</version>
+			<scope>test</scope>
+		</dependency>
+	</dependencies>
+	<dependencyManagement>
+		<dependencies>
+			<dependency>
+				<groupId>it.tdlight</groupId>
+				<artifactId>tdlight-java-bom</artifactId>
+				<version>${revision}</version>
+				<type>pom</type>
+				<scope>import</scope>
+			</dependency>
+		</dependencies>
+	</dependencyManagement>
+	<profiles>
+		<profile>
+			<id>releaseDir</id>
+			<build>
+				<directory>target-release</directory>
+			</build>
+		</profile>
+		<profile>
+			<id>snapshotDir</id>
+			<build>
+				<directory>target-snapshot</directory>
+			</build>
+		</profile>
+	</profiles>
+	<build>
+		<sourceDirectory>../src/main/java</sourceDirectory>
+		<testSourceDirectory>../src/test/java</testSourceDirectory>
+		<plugins>
+			<plugin>
+				<artifactId>maven-clean-plugin</artifactId>
+				<version>3.1.0</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-resources-plugin</artifactId>
+				<version>3.0.2</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-source-plugin</artifactId>
+				<version>3.2.1</version>
+				<executions>
+					<execution>
+						<id>attach-sources</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-javadoc-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<source>17</source>
+					<additionalOptions>-html5</additionalOptions>
+					<level>public</level>
+					<verbose>false</verbose>
+					<quiet>true</quiet>
+					<additionalOptions>-Xdoclint:none</additionalOptions>
+					<additionalJOption>-Xdoclint:none</additionalJOption>
+				</configuration>
+				<executions>
+					<execution>
+						<id>attach-javadocs</id>
+						<goals>
+							<goal>jar</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- ensure the project is compiling with JDK 9+ -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-enforcer-plugin</artifactId>
+				<version>3.0.0-M3</version>
+				<executions>
+					<execution>
+						<id>enforce-jdk9</id>
+						<goals>
+							<goal>enforce</goal>
+						</goals>
+						<configuration>
+							<rules>
+								<requireJavaVersion>
+									<version>[1.9,)</version>
+									<message>JDK 9+ is required for compilation</message>
+								</requireJavaVersion>
+							</rules>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<!-- compile sources -->
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-compiler-plugin</artifactId>
+				<version>3.8.1</version>
+				<configuration>
+					<encoding>UTF-8</encoding>
+					<excludes>
+						<exclude>it/tdlight/tdlib/ClientManager.java</exclude>
+					</excludes>
+					<release>8</release>
+				</configuration>
+				<executions>
+					<!-- disable default phase due to fixed id and position in lifecycle -->
+					<execution>
+						<id>default-compile</id>
+						<phase>none</phase>
+						<!-- specify source/target for IDE integration -->
+						<configuration>
+							<release>9</release>
+						</configuration>
+					</execution>
+					<!-- compile sources with Java 11 -->
+					<execution>
+						<id>java-11-module-compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<release>11</release>
+							<compileSourceRoots>
+								<compileSourceRoot>../src/main/java11</compileSourceRoot>
+							</compileSourceRoots>
+							<multiReleaseOutput>true</multiReleaseOutput>
+						</configuration>
+					</execution>
+					<!-- compile sources with Java 9 to generate and validate module-info.java -->
+					<execution>
+						<id>java-9-module-compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<release>9</release>
+						</configuration>
+					</execution>
+					<!-- recompile sources as Java 8 to overwrite Java 9 class files, except module-info.java -->
+					<execution>
+						<id>java-8-compile</id>
+						<goals>
+							<goal>compile</goal>
+						</goals>
+						<configuration>
+							<!-- specify JDK 9+ release flag to ensure no classes/methods later than Java 8 are used accidentally -->
+							<release>8</release>
+							<!-- exclude module-info.java from the compilation, as it is unsupported by Java 8 -->
+							<excludes>
+								<exclude>it/tdlight/tdlib/ClientManager.java</exclude>
+								<exclude>module-info.java</exclude>
+							</excludes>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>flatten-maven-plugin</artifactId>
+				<version>1.1.0</version>
+				<configuration>
+					<updatePomFile>true</updatePomFile>
+					<flattenMode>oss</flattenMode>
+				</configuration>
+				<executions>
+					<execution>
+						<id>flatten</id>
+						<phase>process-resources</phase>
+						<goals>
+							<goal>flatten</goal>
+						</goals>
+					</execution>
+					<execution>
+						<id>flatten.clean</id>
+						<phase>clean</phase>
+						<goals>
+							<goal>clean</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-jar-plugin</artifactId>
+				<version>3.2.0</version>
+				<configuration>
+					<archive>
+						<manifestEntries>
+							<Multi-Release>true</Multi-Release>
+						</manifestEntries>
+					</archive>
+				</configuration>
+			</plugin>
+			<plugin>
+				<artifactId>maven-install-plugin</artifactId>
+				<version>3.0.0-M1</version>
+			</plugin>
+			<plugin>
+				<artifactId>maven-deploy-plugin</artifactId>
+				<version>2.8.2</version>
+			</plugin>
+			<plugin>
+				<groupId>org.codehaus.mojo</groupId>
+				<artifactId>templating-maven-plugin</artifactId>
+				<version>1.0.0</version>
+				<executions>
+					<execution>
+						<id>filtering-java-templates</id>
+						<goals>
+							<goal>filter-sources</goal>
+						</goals>
+						<configuration>
+							<sourceDirectory>../src/main/java-templates-tdlight</sourceDirectory>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-surefire-plugin</artifactId>
+				<version>3.0.0-M5</version>
+				<dependencies>
+					<dependency>
+						<groupId>org.junit.jupiter</groupId>
+						<artifactId>junit-jupiter-engine</artifactId>
+						<version>5.9.0</version>
+					</dependency>
+				</dependencies>
+			</plugin>
+		</plugins>
+		<pluginManagement>
+			<plugins>
+				<!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+				<plugin>
+					<groupId>org.eclipse.m2e</groupId>
+					<artifactId>lifecycle-mapping</artifactId>
+					<version>1.0.0</version>
+					<configuration>
+						<lifecycleMappingMetadata>
+							<pluginExecutions>
+								<pluginExecution>
+									<pluginExecutionFilter>
+										<groupId>
+											org.codehaus.mojo
+										</groupId>
+										<artifactId>
+											flatten-maven-plugin
+										</artifactId>
+										<versionRange>
+											[1.1.0,)
+										</versionRange>
+										<goals>
+											<goal>flatten</goal>
+										</goals>
+									</pluginExecutionFilter>
+									<action>
+										<ignore></ignore>
+									</action>
+								</pluginExecution>
+							</pluginExecutions>
+						</lifecycleMappingMetadata>
+					</configuration>
+				</plugin>
+			</plugins>
+		</pluginManagement>
+	</build>
+</project>
diff --git a/tdlight-java/.gitignore b/tdlight-java/.gitignore
new file mode 100644
index 0000000..d3464a6
--- /dev/null
+++ b/tdlight-java/.gitignore
@@ -0,0 +1,151 @@
+# ---> Eclipse
+*.pydevproject
+.metadata
+.gradle
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.settings/
+.loadpath
+
+# Eclipse Core
+.project
+
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# JDT-specific (Eclipse Java Development Tools)
+.classpath
+
+# Java annotation processor (APT)
+.factorypath
+
+# PDT-specific
+.buildpath
+
+# sbteclipse plugin
+.target
+
+# TeXlipse plugin
+.texlipse
+
+# ---> Java
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# ---> Maven
+target/
+pom.xml.tag
+pom.xml.releaseBackup
+pom.xml.versionsBackup
+pom.xml.next
+release.properties
+dependency-reduced-pom.xml
+buildNumber.properties
+.mvn/timing.properties
+
+# Created by https://www.gitignore.io/api/intellij+all
+
+### Intellij+all ###
+# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio and WebStorm
+# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+
+# User-specific stuff
+.idea/**/workspace.xml
+.idea/**/tasks.xml
+.idea/**/usage.statistics.xml
+.idea/**/dictionaries
+.idea/**/shelf
+
+# Generated files
+.idea/**/contentModel.xml
+
+# Sensitive or high-churn files
+.idea/**/dataSources/
+.idea/**/dataSources.ids
+.idea/**/dataSources.local.xml
+.idea/**/sqlDataSources.xml
+.idea/**/dynamic.xml
+.idea/**/uiDesigner.xml
+.idea/**/dbnavigator.xml
+
+# Gradle
+.idea/**/gradle.xml
+.idea/**/libraries
+
+# Gradle and Maven with auto-import
+# When using Gradle or Maven with auto-import, you should exclude module files,
+# since they will be recreated, and may cause churn.  Uncomment if using
+# auto-import.
+# .idea/modules.xml
+# .idea/*.iml
+# .idea/modules
+
+# CMake
+cmake-build-*/
+
+# Mongo Explorer plugin
+.idea/**/mongoSettings.xml
+
+# File-based project format
+*.iws
+
+# IntelliJ
+out/
+
+# mpeltonen/sbt-idea plugin
+.idea_modules/
+
+# JIRA plugin
+atlassian-ide-plugin.xml
+
+# Cursive Clojure plugin
+.idea/replstate.xml
+
+# Crashlytics plugin (for Android Studio and IntelliJ)
+com_crashlytics_export_strings.xml
+crashlytics.properties
+crashlytics-build.properties
+fabric.properties
+
+# Editor-based Rest Client
+.idea/httpRequests
+
+# Android studio 3.1+ serialized cache file
+.idea/caches/build_file_checksums.ser
+
+### Intellij+all Patch ###
+# Ignores the whole .idea folder and all .iml files
+# See https://github.com/joeblau/gitignore.io/issues/186 and https://github.com/joeblau/gitignore.io/issues/360
+
+.idea/
+
+# Reason: https://github.com/joeblau/gitignore.io/issues/186#issuecomment-249601023
+
+*.iml
+modules.xml
+.idea/misc.xml
+*.ipr
+
+
+# End of https://www.gitignore.io/api/intellij+all
\ No newline at end of file
diff --git a/tdlight/pom.xml b/tdlight-java/pom.xml
similarity index 90%
rename from tdlight/pom.xml
rename to tdlight-java/pom.xml
index 9a5ae2e..097634b 100644
--- a/tdlight/pom.xml
+++ b/tdlight-java/pom.xml
@@ -1,7 +1,7 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<artifactId>${tdlight.lib.artifact.id}</artifactId>
+	<artifactId>tdlight-java</artifactId>
 	<name>TDLight Java Wrapper</name>
 	<packaging>jar</packaging>
 	<parent>
@@ -13,8 +13,6 @@
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<revision>1.0.0.0-SNAPSHOT</revision>
-		<tdlight.api.artifact.id>tdlight-api-legacy</tdlight.api.artifact.id>
-		<tdlight.lib.artifact.id>tdlight-java-8</tdlight.lib.artifact.id>
 	</properties>
 	<repositories>
 		<repository>
@@ -48,7 +46,7 @@
 	<dependencies>
 		<dependency>
 			<groupId>it.tdlight</groupId>
-			<artifactId>${tdlight.api.artifact.id}</artifactId>
+			<artifactId>tdlight-api-sealed</artifactId>
 		</dependency>
 		<dependency>
 			<groupId>it.unimi.dsi</groupId>
@@ -103,32 +101,6 @@
 				<directory>target-snapshot</directory>
 			</build>
 		</profile>
-		<profile>
-			<id>jdk-with-sealed-interfaces</id>
-			<activation>
-				<property>
-					<name>tdlight.build.type</name>
-					<value>standard</value>
-				</property>
-			</activation>
-			<properties>
-				<tdlight.api.artifact.id>tdlight-api-sealed</tdlight.api.artifact.id>
-				<tdlight.lib.artifact.id>tdlight-java</tdlight.lib.artifact.id>
-			</properties>
-		</profile>
-		<profile>
-			<id>jdk-with-legacy-interfaces</id>
-			<activation>
-				<property>
-					<name>tdlight.build.type</name>
-					<value>legacy</value>
-				</property>
-			</activation>
-			<properties>
-				<tdlight.api.artifact.id>tdlight-api-legacy</tdlight.api.artifact.id>
-				<tdlight.lib.artifact.id>tdlight-java-8</tdlight.lib.artifact.id>
-			</properties>
-		</profile>
 	</profiles>
 	<build>
 		<sourceDirectory>../src/main/java</sourceDirectory>