diff --git a/.github/bintray-settings.xml b/.github/bintray-settings.xml
new file mode 100644
index 0000000..85f42df
--- /dev/null
+++ b/.github/bintray-settings.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<settings xmlns="http://maven.apache.org/SETTINGS/1.0.0"
+          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/SETTINGS/1.0.0
+                      http://maven.apache.org/xsd/settings-1.0.0.xsd">
+    <servers>
+        <server>
+            <id>bintray-vorpal-research-kotlin-maven</id>
+            <username>${env.BINTRAY_USERNAME}</username>
+            <password>${env.BINTRAY_PASSWORD}</password>
+        </server>
+    </servers>
+</settings>
diff --git a/.github/workflows/deployment.yml b/.github/workflows/deployment.yml
new file mode 100644
index 0000000..3b4aea5
--- /dev/null
+++ b/.github/workflows/deployment.yml
@@ -0,0 +1,53 @@
+name: Java CD
+
+on: 
+  release:
+    types: published
+
+jobs:
+  publish:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Deploy to Bintray
+      id: deploy-to-bintray
+      run: |
+        mvn versions:set -DnewVersion=${{ github.event.release.tag_name }}
+        mvn deploy -s .github/bintray-settings.xml || echo "deploy failed" >&2
+      env:
+        BINTRAY_USERNAME: ${{ secrets.bintray_username }}
+        BINTRAY_PASSWORD: ${{ secrets.bintray_password }}
+
+    - name: Move sources jar file
+      run: mv target/*-sources.jar sources.jar
+
+    - name: Move target jar file
+      run: mv target/*.jar target.jar
+
+    - name: Attach source jar to release
+      id: upload-source-asset
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: sources.jar
+        asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}-sources.jar
+        asset_content_type: application/zip
+
+    - name: Attach target jar to release
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1.0.1
+      env:
+        GITHUB_TOKEN: ${{ github.token }}
+      with:
+        upload_url: ${{ github.event.release.upload_url }}
+        asset_path: target.jar
+        asset_name: ${{ github.event.repository.name }}-${{ github.event.release.tag_name }}.jar
+        asset_content_type: application/zip
\ No newline at end of file
diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
new file mode 100644
index 0000000..a02111a
--- /dev/null
+++ b/.github/workflows/integration.yml
@@ -0,0 +1,17 @@
+name: Java CI
+
+on: [push]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v1
+      - name: Set up JDK 1.8
+        uses: actions/setup-java@v1
+        with:
+          java-version: 1.8
+      - name: Build with Maven
+        run: mvn -B package
diff --git a/.gitignore b/.gitignore
index f83e8cf..f7b2a25 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 .idea
 target
 *.iml
+*.tokens
diff --git a/pom.xml b/pom.xml
index ccf8d62..4a1668a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,8 +16,8 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <antlr4.visitor>true</antlr4.visitor>
         <antlr4.listener>true</antlr4.listener>
-        <kotlin.version>1.2.51</kotlin.version>
-        <antlr4.version>4.7.1</antlr4.version>
+        <kotlin.version>1.3.61</kotlin.version>
+        <antlr4.version>4.8</antlr4.version>
     </properties>
 
     <dependencies>
@@ -26,11 +26,6 @@
             <artifactId>kotlin-stdlib-jdk8</artifactId>
             <version>${kotlin.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.jetbrains.kotlin</groupId>
-            <artifactId>kotlin-reflect</artifactId>
-            <version>${kotlin.version}</version>
-        </dependency>
         <dependency>
             <groupId>org.jetbrains.kotlin</groupId>
             <artifactId>kotlin-test</artifactId>
@@ -65,29 +60,49 @@
                 <includes><include>**/*.g4</include></includes>
             </resource>
         </resources>
+
         <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>build-helper-maven-plugin</artifactId>
+                <version>3.0.0</version>
+
+                <executions>
+                    <execution>
+                        <phase>process-sources</phase>
+                        <goals>
+                            <goal>add-source</goal>
+                        </goals>
+                        <configuration>
+                            <sources>
+                                <source>src/main/kotlin</source>
+                                <source>src/main/antlr4</source>
+                            </sources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-assembly-plugin</artifactId>
-                <version>2.6</version>
-                <configuration>
-                    <descriptorRefs>
-                        <descriptorRef>jar-with-dependencies</descriptorRef>
-                    </descriptorRefs>
-                    <archive>
-                        <manifest>
-                            <mainClass>ru.spbstu.grammarConverter.MainKt</mainClass>
-                        </manifest>
-                    </archive>
-                </configuration>
+                <artifactId>maven-source-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>make-assembly</id>
-                        <phase>package</phase>
-                        <goals><goal>single</goal></goals>
+                        <id>attach-sources</id>
+                        <goals>
+                            <goal>jar</goal>
+                        </goals>
                     </execution>
                 </executions>
+                <configuration>
+                    <includes>
+                        <include>**/*.kt</include>
+                        <include>**/*.java</include>
+                        <include>**/*.g4</include>
+                    </includes>
+                </configuration>
             </plugin>
+
             <plugin>
                 <groupId>org.antlr</groupId>
                 <artifactId>antlr4-maven-plugin</artifactId>
diff --git a/src/main/antlr4/ANTLRv4Lexer.tokens b/src/main/antlr4/ANTLRv4Lexer.tokens
deleted file mode 100644
index 1bf330e..0000000
--- a/src/main/antlr4/ANTLRv4Lexer.tokens
+++ /dev/null
@@ -1,78 +0,0 @@
-TOKEN_REF=1
-RULE_REF=2
-LEXER_CHAR_SET=3
-DOC_COMMENT=4
-BLOCK_COMMENT=5
-LINE_COMMENT=6
-INT=7
-STRING_LITERAL=8
-UNTERMINATED_STRING_LITERAL=9
-BEGIN_ARGUMENT=10
-BEGIN_ACTION=11
-OPTIONS=12
-TOKENS=13
-CHANNELS=14
-IMPORT=15
-FRAGMENT=16
-LEXER=17
-PARSER=18
-GRAMMAR=19
-PROTECTED=20
-PUBLIC=21
-PRIVATE=22
-RETURNS=23
-LOCALS=24
-THROWS=25
-CATCH=26
-FINALLY=27
-MODE=28
-COLON=29
-COLONCOLON=30
-COMMA=31
-SEMI=32
-LPAREN=33
-RPAREN=34
-LBRACE=35
-RBRACE=36
-RARROW=37
-LT=38
-GT=39
-ASSIGN=40
-QUESTION=41
-STAR=42
-PLUS_ASSIGN=43
-PLUS=44
-OR=45
-DOLLAR=46
-RANGE=47
-DOT=48
-AT=49
-POUND=50
-NOT=51
-ID=52
-WS=53
-ERRCHAR=54
-END_ARGUMENT=55
-UNTERMINATED_ARGUMENT=56
-ARGUMENT_CONTENT=57
-END_ACTION=58
-UNTERMINATED_ACTION=59
-ACTION_CONTENT=60
-UNTERMINATED_CHAR_SET=61
-'options'=12
-'tokens'=13
-'channels'=14
-'import'=15
-'fragment'=16
-'lexer'=17
-'parser'=18
-'grammar'=19
-'protected'=20
-'public'=21
-'private'=22
-'returns'=23
-'locals'=24
-'throws'=25
-'catch'=26
-'finally'=27
-'mode'=28
diff --git a/src/main/antlr4/LexBasic.tokens b/src/main/antlr4/LexBasic.tokens
deleted file mode 100644
index e69de29..0000000