diff --git a/p8compile.cmd b/p8compile.cmd
index a27cef287..82585cd5a 100644
--- a/p8compile.cmd
+++ b/p8compile.cmd
@@ -1,4 +1,6 @@
-set PROG8CLASSPATH=./out/production/compiler;./out/production/parser
+@echo off
+
+set PROG8CLASSPATH=./out/production/compiler_main;./out/production/parser_main
 set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin
 set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar;./parser/antlr/lib/antlr-runtime-4.7.2.jar
 
diff --git a/p8compile.sh b/p8compile.sh
index 79470c4f3..03a3af387 100755
--- a/p8compile.sh
+++ b/p8compile.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-PROG8CLASSPATH=./out/production/prog8.compiler.main:./out/production/prog8.parser.main
+PROG8CLASSPATH=./out/production/compiler_main:./out/production/parser_main
 KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin
 LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar:./parser/antlr/lib/antlr-runtime-4.7.2.jar
 
diff --git a/p8vm.cmd b/p8vm.cmd
index f53f438ab..004f86dd8 100644
--- a/p8vm.cmd
+++ b/p8vm.cmd
@@ -1,4 +1,6 @@
-set PROG8CLASSPATH=./out/production/compiler
+@echo off
+
+set PROG8CLASSPATH=./out/production/compiler_main
 set KOTLINPATH=%USERPROFILE%/.IdeaIC2018.3/config/plugins/Kotlin
 set LIBJARS=%KOTLINPATH%/lib/kotlin-stdlib.jar;%KOTLINPATH%/lib/kotlin-reflect.jar
 
diff --git a/p8vm.sh b/p8vm.sh
index d56ae6b2e..45c5c367c 100755
--- a/p8vm.sh
+++ b/p8vm.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-PROG8CLASSPATH=./out/production/prog8.compiler.main
+PROG8CLASSPATH=./out/production/compiler_main
 KOTLINPATH=${HOME}/.IntelliJIdea2018.3/config/plugins/Kotlin
 LIBJARS=${KOTLINPATH}/lib/kotlin-stdlib.jar:${KOTLINPATH}/lib/kotlin-reflect.jar
 
diff --git a/prog8.iml b/prog8.iml
index e5e2d011e..a3d1f940e 100644
--- a/prog8.iml
+++ b/prog8.iml
@@ -1,10 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.id="prog8" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
-  <component name="FacetManager">
-    <facet type="Python" name="Python">
-      <configuration sdkName="Python 3.7" />
-    </facet>
-  </component>
   <component name="NewModuleRootManager" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
@@ -16,6 +11,5 @@
     </content>
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" name="Python 3.7 interpreter library" level="application" />
   </component>
 </module>
\ No newline at end of file