another big refactor

src/bin/HelloWorld.hx

@@ -1,8 +1,9 @@
 package bin;
 
+import lib.cli.TermHandle;
+import lib.cli.CLIBase;
+
 using tink.CoreApi;
-import lib.TermHandle;
-import lib.CLIBase;
 
 class HelloWorld extends CLIBase {
 	public function invoke(handle: TermHandle):Future<Bool> {

src/bin/Net.hx

@@ -1,12 +1,12 @@
 package bin;
 
-using tink.CoreApi;
-
 import kernel.peripherals.Peripherals.Peripheral;
 import kernel.net.Routing;
 import haxe.ds.ReadOnlyArray;
-import lib.TermHandle;
-import lib.CLIBase;
+import lib.cli.TermHandle;
+import lib.cli.CLIBase;
+
+using tink.CoreApi;
 
 class Net extends CLIBase {
 	private var handle:TermHandle;

src/bin/Terminal.hx

@@ -1,8 +1,8 @@
 package bin;
 
-import lib.TermHandle;
-import lib.CLIBase;
-import util.Color;
+import lib.cli.TermHandle;
+import lib.cli.CLIBase;
+import lib.Color;
 import kernel.ui.WindowContext;
 import kernel.ui.WindowManager;