diff --git a/noether.nimble b/noether.nimble
index 3f4ffdc..e6c4a12 100644
--- a/noether.nimble
+++ b/noether.nimble
@@ -9,6 +9,5 @@ installExt    = @["nim"]
 bin           = @["noether", "nlx"]
 backend       = "c"
 
-
 # Dependencies
 requires "nim >= 2.2.0"
diff --git a/src/nlx.nim b/src/nlx.nim
index b79cd2e..1c6c446 100644
--- a/src/nlx.nim
+++ b/src/nlx.nim
@@ -1,5 +1,5 @@
 import os
-import noether/lex
+import noether/lexer/tokstream
 
 when isMainModule:
   echo "Noether Lang Extras v0.1.0 - nlx"
diff --git a/src/noether/lstream.nim b/src/noether/lexer/lstream.nim
similarity index 100%
rename from src/noether/lstream.nim
rename to src/noether/lexer/lstream.nim
diff --git a/src/noether/tokens.nim b/src/noether/lexer/tokens.nim
similarity index 100%
rename from src/noether/tokens.nim
rename to src/noether/lexer/tokens.nim
diff --git a/src/noether/lex.nim b/src/noether/lexer/tokstream.nim
similarity index 100%
rename from src/noether/lex.nim
rename to src/noether/lexer/tokstream.nim