diff --git a/rust/src/lib.rs b/rust/src/lib.rs
index c14d399..58f25de 100644
--- a/rust/src/lib.rs
+++ b/rust/src/lib.rs
@@ -2,34 +2,10 @@ use std::net::SocketAddr;
 
 use godot::prelude::*;
 
+mod network_manager;
 mod ui;
 
 struct MyExtension;
 
 #[gdextension]
 unsafe impl ExtensionLibrary for MyExtension {}
-
-#[derive(GodotClass)]
-#[class(base=Node)]
-struct NetworkManager {
-    base: Base<Node>,
-}
-
-pub const NETWORK_SINGLETON_NAME: &str = "NetworkManagerGlob";
-
-#[godot_api]
-impl INode for NetworkManager {
-    fn init(base: Base<Node>) -> Self {
-        NetworkManager { base }
-    }
-}
-
-impl NetworkManager {
-    pub fn host(&mut self, port: u32) {
-        godot_print!("Hosting server at {}", port);
-    }
-
-    pub fn join(&mut self, addr: SocketAddr) {
-        godot_print!("Joining server at {:?}", addr);
-    }
-}
diff --git a/rust/src/network_manager.rs b/rust/src/network_manager.rs
new file mode 100644
index 0000000..d60499e
--- /dev/null
+++ b/rust/src/network_manager.rs
@@ -0,0 +1,28 @@
+use std::net::SocketAddr;
+
+use godot::prelude::*;
+
+#[derive(GodotClass)]
+#[class(base=Node)]
+pub struct NetworkManager {
+    base: Base<Node>,
+}
+
+pub const NETWORK_SINGLETON_NAME: &str = "NetworkManagerGlob";
+
+#[godot_api]
+impl INode for NetworkManager {
+    fn init(base: Base<Node>) -> Self {
+        NetworkManager { base }
+    }
+}
+
+impl NetworkManager {
+    pub fn host(&mut self, port: u32) {
+        godot_print!("Hosting server at {}", port);
+    }
+
+    pub fn join(&mut self, addr: SocketAddr) {
+        godot_print!("Joining server at {:?}", addr);
+    }
+}
diff --git a/rust/src/ui/cli.rs b/rust/src/ui/cli.rs
index b7711f7..8815734 100644
--- a/rust/src/ui/cli.rs
+++ b/rust/src/ui/cli.rs
@@ -3,17 +3,11 @@ use std::net::SocketAddr;
 use std::ops::DerefMut;
 use std::rc::Rc;
 
-use godot::classes::{Engine, RichTextLabel, ScrollContainer};
+use godot::classes::{Engine, IPanel, Panel, RichTextLabel, ScrollContainer, TextEdit};
 use godot::prelude::*;
-
 use godot::tools::get_autoload_by_name;
-use godot::{
-    classes::{IPanel, Panel, TextEdit},
-    obj::Base,
-    register::{GodotClass, godot_api},
-};
 
-use crate::{NETWORK_SINGLETON_NAME, NetworkManager};
+use crate::network_manager::{NETWORK_SINGLETON_NAME, NetworkManager};
 
 pub enum CliColor {
     Command,