diff --git a/.gitignore b/.gitignore
index f26828b79..b449fc760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -26,6 +26,7 @@ parser.out
parsetab.py
.pytest_cache/
.attach_pid*
+compiler/lib/
.gradle
/prog8compiler.jar
diff --git a/.idea/libraries/antlr_4_9_complete.xml b/.idea/libraries/antlr_4_9_complete.xml
deleted file mode 100644
index 8db4116d5..000000000
--- a/.idea/libraries/antlr_4_9_complete.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/antlr_antlr4.xml b/.idea/libraries/antlr_antlr4.xml
new file mode 100644
index 000000000..b8ed27b15
--- /dev/null
+++ b/.idea/libraries/antlr_antlr4.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/antlr_runtime_4_9.xml b/.idea/libraries/antlr_runtime_4_9.xml
deleted file mode 100644
index cd7a59037..000000000
--- a/.idea/libraries/antlr_runtime_4_9.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/dbus_java_3_2_4.xml b/.idea/libraries/dbus_java_3_2_4.xml
deleted file mode 100644
index bdfe4eb8d..000000000
--- a/.idea/libraries/dbus_java_3_2_4.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/github_hypfvieh_dbus_java.xml b/.idea/libraries/github_hypfvieh_dbus_java.xml
new file mode 100644
index 000000000..3e0ea4abc
--- /dev/null
+++ b/.idea/libraries/github_hypfvieh_dbus_java.xml
@@ -0,0 +1,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/glassfish_javax_json.xml b/.idea/libraries/glassfish_javax_json.xml
new file mode 100644
index 000000000..00e6491ae
--- /dev/null
+++ b/.idea/libraries/glassfish_javax_json.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/hamcrest.xml b/.idea/libraries/hamcrest.xml
new file mode 100644
index 000000000..3f07c43e5
--- /dev/null
+++ b/.idea/libraries/hamcrest.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/javax_json_api_1_1_4.xml b/.idea/libraries/javax_json_api_1_1_4.xml
deleted file mode 100644
index 967286d8c..000000000
--- a/.idea/libraries/javax_json_api_1_1_4.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/jetbrains_kotlinx_cli_jvm.xml b/.idea/libraries/jetbrains_kotlinx_cli_jvm.xml
new file mode 100644
index 000000000..946b35153
--- /dev/null
+++ b/.idea/libraries/jetbrains_kotlinx_cli_jvm.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/junit_jupiter.xml b/.idea/libraries/junit_jupiter.xml
new file mode 100644
index 000000000..6021a8070
--- /dev/null
+++ b/.idea/libraries/junit_jupiter.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/kotlinx_cli_jvm.xml b/.idea/libraries/kotlinx_cli_jvm.xml
deleted file mode 100644
index 2233ef7ae..000000000
--- a/.idea/libraries/kotlinx_cli_jvm.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/slf4j_api_1_7_30.xml b/.idea/libraries/slf4j_api_1_7_30.xml
deleted file mode 100644
index 20de6d972..000000000
--- a/.idea/libraries/slf4j_api_1_7_30.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/slf4j_simple.xml b/.idea/libraries/slf4j_simple.xml
new file mode 100644
index 000000000..3f857515d
--- /dev/null
+++ b/.idea/libraries/slf4j_simple.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/takes.xml b/.idea/libraries/takes.xml
new file mode 100644
index 000000000..44774afe0
--- /dev/null
+++ b/.idea/libraries/takes.xml
@@ -0,0 +1,13 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/libraries/takes_http.xml b/.idea/libraries/takes_http.xml
deleted file mode 100644
index 0fdcac0d5..000000000
--- a/.idea/libraries/takes_http.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/.idea/libraries/unittest_libs.xml b/.idea/libraries/unittest_libs.xml
deleted file mode 100644
index 2537bc96e..000000000
--- a/.idea/libraries/unittest_libs.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/compiler/compiler.iml b/compiler/compiler.iml
index daef22628..854b6ae2f 100644
--- a/compiler/compiler.iml
+++ b/compiler/compiler.iml
@@ -16,9 +16,10 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/compiler/lib/apiguardian-api-1.1.2.jar b/compiler/lib/apiguardian-api-1.1.2.jar
deleted file mode 100644
index 2b678e154..000000000
Binary files a/compiler/lib/apiguardian-api-1.1.2.jar and /dev/null differ
diff --git a/compiler/lib/hamcrest-2.2.jar b/compiler/lib/hamcrest-2.2.jar
deleted file mode 100644
index 71065788d..000000000
Binary files a/compiler/lib/hamcrest-2.2.jar and /dev/null differ
diff --git a/compiler/lib/junit-jupiter-api-5.7.2.jar b/compiler/lib/junit-jupiter-api-5.7.2.jar
deleted file mode 100644
index 7f67ded1f..000000000
Binary files a/compiler/lib/junit-jupiter-api-5.7.2.jar and /dev/null differ
diff --git a/compiler/lib/junit-platform-commons-1.7.2.jar b/compiler/lib/junit-platform-commons-1.7.2.jar
deleted file mode 100644
index af133c4db..000000000
Binary files a/compiler/lib/junit-platform-commons-1.7.2.jar and /dev/null differ
diff --git a/compiler/lib/kotlinx-cli-jvm-0.3.2.jar b/compiler/lib/kotlinx-cli-jvm-0.3.2.jar
deleted file mode 100644
index 5225f4fcb..000000000
Binary files a/compiler/lib/kotlinx-cli-jvm-0.3.2.jar and /dev/null differ
diff --git a/compiler/lib/opentest4j-1.2.0.jar b/compiler/lib/opentest4j-1.2.0.jar
deleted file mode 100644
index d5006361a..000000000
Binary files a/compiler/lib/opentest4j-1.2.0.jar and /dev/null differ
diff --git a/compilerAst/compilerAst.iml b/compilerAst/compilerAst.iml
index efb9d1529..e4955a864 100644
--- a/compilerAst/compilerAst.iml
+++ b/compilerAst/compilerAst.iml
@@ -12,7 +12,8 @@
-
-
+
+
+
\ No newline at end of file
diff --git a/dbusCompilerService/build.gradle b/dbusCompilerService/build.gradle
index d36c65428..846dc15ff 100644
--- a/dbusCompilerService/build.gradle
+++ b/dbusCompilerService/build.gradle
@@ -19,7 +19,7 @@ dependencies {
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8"
// implementation "org.jetbrains.kotlin:kotlin-reflect"
implementation 'org.jetbrains.kotlinx:kotlinx-cli:0.3.3'
- implementation "com.github.hypfvieh:dbus-java:3.2.4"
+ implementation "com.github.hypfvieh:dbus-java:3.3.0"
implementation "org.slf4j:slf4j-simple:1.7.30"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit5"
diff --git a/dbusCompilerService/dbusCompilerService.iml b/dbusCompilerService/dbusCompilerService.iml
index 0bce44ebc..3b8cb3996 100644
--- a/dbusCompilerService/dbusCompilerService.iml
+++ b/dbusCompilerService/dbusCompilerService.iml
@@ -9,7 +9,7 @@
-
-
+
+
\ No newline at end of file
diff --git a/dbusCompilerService/lib/dbus-java-3.2.4.jar b/dbusCompilerService/lib/dbus-java-3.2.4.jar
deleted file mode 100644
index 3a0cff3c3..000000000
Binary files a/dbusCompilerService/lib/dbus-java-3.2.4.jar and /dev/null differ
diff --git a/httpCompilerService/httpCompilerService.iml b/httpCompilerService/httpCompilerService.iml
index ab219e7ad..b77b1991c 100644
--- a/httpCompilerService/httpCompilerService.iml
+++ b/httpCompilerService/httpCompilerService.iml
@@ -9,9 +9,10 @@
-
-
-
+
+
+
+
\ No newline at end of file
diff --git a/httpCompilerService/lib/cactoos-0.42.jar b/httpCompilerService/lib/cactoos-0.42.jar
deleted file mode 100644
index d06fb37c8..000000000
Binary files a/httpCompilerService/lib/cactoos-0.42.jar and /dev/null differ
diff --git a/httpCompilerService/lib/commons-lang3-3.7.jar b/httpCompilerService/lib/commons-lang3-3.7.jar
deleted file mode 100644
index f37ded60f..000000000
Binary files a/httpCompilerService/lib/commons-lang3-3.7.jar and /dev/null differ
diff --git a/httpCompilerService/lib/commons-text-1.4.jar b/httpCompilerService/lib/commons-text-1.4.jar
deleted file mode 100644
index 3e81a797c..000000000
Binary files a/httpCompilerService/lib/commons-text-1.4.jar and /dev/null differ
diff --git a/httpCompilerService/lib/javax.json-1.1.4.jar b/httpCompilerService/lib/javax.json-1.1.4.jar
deleted file mode 100644
index f6ca0cc43..000000000
Binary files a/httpCompilerService/lib/javax.json-1.1.4.jar and /dev/null differ
diff --git a/httpCompilerService/lib/javax.json-api-1.1.4.jar b/httpCompilerService/lib/javax.json-api-1.1.4.jar
deleted file mode 100644
index 367f0ad4e..000000000
Binary files a/httpCompilerService/lib/javax.json-api-1.1.4.jar and /dev/null differ
diff --git a/httpCompilerService/lib/slf4j-api-1.7.30.jar b/httpCompilerService/lib/slf4j-api-1.7.30.jar
deleted file mode 100644
index 29ac26fb8..000000000
Binary files a/httpCompilerService/lib/slf4j-api-1.7.30.jar and /dev/null differ
diff --git a/httpCompilerService/lib/slf4j-simple-1.7.30.jar b/httpCompilerService/lib/slf4j-simple-1.7.30.jar
deleted file mode 100644
index 6debaa9de..000000000
Binary files a/httpCompilerService/lib/slf4j-simple-1.7.30.jar and /dev/null differ
diff --git a/httpCompilerService/lib/takes-1.19.jar b/httpCompilerService/lib/takes-1.19.jar
deleted file mode 100644
index f118aceaf..000000000
Binary files a/httpCompilerService/lib/takes-1.19.jar and /dev/null differ
diff --git a/parser/antlr/Makefile b/parser/antlr/Makefile
index b44c492ec..7f16168e9 100644
--- a/parser/antlr/Makefile
+++ b/parser/antlr/Makefile
@@ -1,3 +1,3 @@
parser:
- ./antlr.sh -o ../src/prog8/parser -no-listener -no-visitor -package prog8.parser -Dlanguage=Java prog8.g4
+ ./antlr.sh -o ../src/prog8/parser -no-listener -no-visitor -package prog8.parser -Dlanguage=Java Prog8ANTLR.g4
diff --git a/parser/antlr/lib/antlr-4.9.2-complete.jar b/parser/antlr/lib/antlr-4.9.2-complete.jar
deleted file mode 100644
index f68c92666..000000000
Binary files a/parser/antlr/lib/antlr-4.9.2-complete.jar and /dev/null differ
diff --git a/parser/antlr/lib/antlr-runtime-4.9.2.jar b/parser/antlr/lib/antlr-runtime-4.9.2.jar
deleted file mode 100644
index ab5a3b447..000000000
Binary files a/parser/antlr/lib/antlr-runtime-4.9.2.jar and /dev/null differ
diff --git a/parser/parser.iml b/parser/parser.iml
index f24e94ed4..685671dfd 100644
--- a/parser/parser.iml
+++ b/parser/parser.iml
@@ -8,6 +8,6 @@
-
+
\ No newline at end of file