diff --git a/README.md b/README.md
index 70a6d16..3a56270 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@ This is a crystal project to manage setting up OptionParser objects based around
 
 ## Usage
 ```crystal
-require "cli_generator"
+require "cligen"
 ```
 
 ## Contributors
diff --git a/src/cligen.cr b/src/cligen.cr
index e799265..4e6c57b 100644
--- a/src/cligen.cr
+++ b/src/cligen.cr
@@ -1,6 +1,6 @@
 require "option_parser"
-require "./regex"
-require "./format"
+require "./cligen/regex"
+require "./cligen/format"
 
 module CliGen
   VERSION = "0.1.0"
diff --git a/src/command.cr b/src/cligen/command.cr
similarity index 100%
rename from src/command.cr
rename to src/cligen/command.cr
diff --git a/src/command/parser.cr b/src/cligen/command/parser.cr
similarity index 100%
rename from src/command/parser.cr
rename to src/cligen/command/parser.cr
diff --git a/src/format.cr b/src/cligen/format.cr
similarity index 100%
rename from src/format.cr
rename to src/cligen/format.cr
diff --git a/src/regex.cr b/src/cligen/regex.cr
similarity index 100%
rename from src/regex.cr
rename to src/cligen/regex.cr