diff --git a/extern-files/js/import.hx b/extern-files/js/import.hx
deleted file mode 100644
index e69de29..0000000
diff --git a/src/nat/CLI.hx b/src/nat/CLI.hx
index aeb59ea..7c5fa30 100644
--- a/src/nat/CLI.hx
+++ b/src/nat/CLI.hx
@@ -1,14 +1,7 @@
 package nat;
 
-import kiss.Prelude;
-import kiss.List;
-import sys.FileSystem;
-import nat.ArchiveController;
-import nat.systems.PlaygroundSystem;
-import nat.components.*;
-import haxe.ds.Option;
-
-using StringTools;
-
-@:build(kiss.Kiss.build())
-class CLI implements ArchiveUI {}
+class CLI {
+    static function main() {
+        CLI_.main();
+    }
+}
diff --git a/src/nat/CLI.kiss b/src/nat/CLI_.kiss
similarity index 95%
rename from src/nat/CLI.kiss
rename to src/nat/CLI_.kiss
index f899465..f3331a7 100644
--- a/src/nat/CLI.kiss
+++ b/src/nat/CLI_.kiss
@@ -1,3 +1,11 @@
+(import sys.FileSystem)
+(import nat.ArchiveController)
+(import nat.systems.PlaygroundSystem)
+(importAll nat.components)
+(import haxe.ds.Option)
+
+(implements nat.ArchiveUI)
+
 // External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
 (load "Lib.kiss")
 
@@ -6,7 +14,7 @@
         (let [controller
                     (new ArchiveController
                         (new Archive archiveDir)
-                        (new CLI))]
+                        (new CLI_))]
             (loop
                 (Sys.print ">> ")
                 (let [command
diff --git a/src/nat/systems/MediaWikiSystem.kiss b/src/nat/systems/MediaWikiSystem.kiss
index c8ba651..014059f 100644
--- a/src/nat/systems/MediaWikiSystem.kiss
+++ b/src/nat/systems/MediaWikiSystem.kiss
@@ -20,10 +20,10 @@
                 (#extern String python
                     (object
                         hxmlFile "extern-files/python/args.hxml"
-                        importHxFile "extern-files/python/import.hx"
                         langProjectFile "extern-files/python/requirements.txt")
                     [:Map<String,Array<String>> params _ :String mediaWikiUrl _ :String maxLag (if maxLag (Std.string maxLag) "1") :Map<String,String> headers _]
                     
+                    (import requests_externs.Requests)
                     (print "extern query call $params")
                     (let [response
                                 (Requests.get mediaWikiUrl 
diff --git a/src/nat/systems/RemarkableAPISystem.kiss b/src/nat/systems/RemarkableAPISystem.kiss
index 8f70950..ad895bd 100644
--- a/src/nat/systems/RemarkableAPISystem.kiss
+++ b/src/nat/systems/RemarkableAPISystem.kiss
@@ -10,7 +10,6 @@
         (object
             hxmlFile "extern-files/js/args.hxml"
             skipHaxelibInstall true
-            importHxFile "extern-files/js/import.hx"
             langProjectFile "extern-files/js/package.json")
         []
         (print "extern hello world!")))
diff --git a/src/test/TestMain.hx b/src/test/TestMain.hx
index e958a0e..ef57c85 100644
--- a/src/test/TestMain.hx
+++ b/src/test/TestMain.hx
@@ -1,14 +1,7 @@
 package test;
 
-import kiss.Kiss;
-import kiss.Prelude;
-import nat.BoolExpInterp;
-import nat.Archive;
-import nat.ArchiveController;
-import nat.Lib;
-import nat.components.*;
-import nat.systems.*;
-import uuid.Uuid;
-
-@:build(kiss.Kiss.build())
-class TestMain {}
+class TestMain {
+    static function main() {
+        TestMain_.main();
+    }
+}
diff --git a/src/test/TestMain.kiss b/src/test/TestMain_.kiss
similarity index 89%
rename from src/test/TestMain.kiss
rename to src/test/TestMain_.kiss
index 23cc25f..bc37d94 100644
--- a/src/test/TestMain.kiss
+++ b/src/test/TestMain_.kiss
@@ -1,3 +1,11 @@
+(import nat.BoolExpInterp)
+(import nat.Archive)
+(import nat.ArchiveController)
+(import nat.Lib)
+(importAll nat.components)
+(importAll nat.systems)
+(import uuid.Uuid)
+
 // External programs can load Lib.kiss with (loadFrom "nat-archive-tool" "src/nat/Lib.kiss")
 (load "../nat/Lib.kiss")