diff --git a/src/lib.rs b/src/lib.rs
index bb85afe..94ce2a7 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -4,35 +4,34 @@
 
 // Use modules
 mod modules {
-  pub mod rustlang;
+	pub mod rustlang;
 }
 
 // Use subcommands
-// FIXME: Define modules for commands in `src/subcoms/<COMMAND>/rustlang/<COMMAND>/<COMMAND>();`
 pub mod subcoms { 
-  pub mod resolve {
-      pub mod rustlang {
-        pub mod resolve;
-      }
-  }
-  pub mod remove {
-      pub mod rustlang {
-        pub mod remove;
-      }
-  }
-  pub mod list {
-      pub mod rustlang {
-        pub mod list;
-      }
-  }
-  pub mod deploy {
-      pub mod rustlang {
-        pub mod deploy;
-      }
-  }
-  pub mod hijack {
-      pub mod rustlang {
-        pub mod hijack;
-      }
-  }
+	pub mod resolve {
+			pub mod rustlang {
+				pub mod resolve;
+			}
+	}
+	pub mod remove {
+			pub mod rustlang {
+				pub mod remove;
+			}
+	}
+	pub mod deploy {
+			pub mod rustlang {
+				pub mod deploy;
+			}
+	}
+	pub mod hijack {
+			pub mod rustlang {
+				pub mod hijack;
+			}
+	}
+	pub mod list {
+		pub mod rustlang {
+			pub mod list;
+		}
+	}
 }
\ No newline at end of file
diff --git a/src/subcoms/list/rustlang/list.rs b/src/subcoms/list/rustlang/list.rs
index 0692ae7..1b3108e 100644
--- a/src/subcoms/list/rustlang/list.rs
+++ b/src/subcoms/list/rustlang/list.rs
@@ -1,6 +1,6 @@
 use zernit_logger::fixme;
 
-pub fn hijack() {
+pub fn list() {
 	fixme!("Output installed packages");
 		unimplemented!("Listing is not yet implemented");
 }
\ No newline at end of file
diff --git a/src/subcoms/remove/rustlang/remove.rs b/src/subcoms/remove/rustlang/remove.rs
index 6876015..d49c2e8 100644
--- a/src/subcoms/remove/rustlang/remove.rs
+++ b/src/subcoms/remove/rustlang/remove.rs
@@ -1,6 +1,6 @@
 use zernit_logger::fixme;
 
-pub fn resolve() {
+pub fn remove() {
 	fixme!("Remove package from specified root");
 		unimplemented!("Removal of packages from specified root is not yet supported");
 }
\ No newline at end of file