diff --git a/.gitignore b/.gitignore
index 4befed3..709c7b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 .DS_Store
-.idea
+.idea/
+vendor/
\ No newline at end of file
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..6f2e134
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,24 @@
+{
+    "name": "statonlab/fields_generator",
+    "homepage": "https://github.com/statonlab/fields_generator",
+    "license": "GPL-2.0",
+    "authors": [
+        {
+            "name": "Abdullah Almsaeed",
+            "email": "aalmsaee@utk.edu"
+        },
+        {
+            "name": "Bradford Condon",
+            "email": "bcondon@utk.edu"
+        }
+    ],
+    "require": {},
+    "autoload": {
+        "psr-4": {
+            "StatonLab\\FieldGenerator\\": "src/"
+        }
+    },
+    "bin" : [
+        "makefield"
+    ]
+}
diff --git a/generate.php b/generate.php
deleted file mode 100644
index 4a274ce..0000000
--- a/generate.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace FieldGenerator;
-
-require __DIR__.'/src/bootstrap.php';
-
-use FieldGenerator\Src\Generator;
-use Exception;
-
-$app = new Generator();
-$prompt = $app->prompt();
-
-try {
-    $path = $app->run();
-} catch (Exception $exception) {
-    $prompt->error($exception->getMessage());
-    exit(1);
-}
-
-$prompt->success('Field generated successfully.');
-$prompt->success("The field can be found at {$path['field']}");
diff --git a/makefield b/makefield
new file mode 100755
index 0000000..8ffd8da
--- /dev/null
+++ b/makefield
@@ -0,0 +1,23 @@
+#!/usr/bin/env php
+<?php
+
+if (file_exists(__DIR__.'/../../autoload.php')) {
+    require __DIR__.'/../../autoload.php';
+} elseif (file_exists(__DIR__.'/vendor/autoload.php')) {
+    require __DIR__.'/vendor/autoload.php';
+} else {
+    require __DIR__.'/src/bootstrap.php';
+}
+
+$app = new StatonLab\FieldGenerator\Generator();
+$prompt = $app->prompt();
+
+try {
+    $path = $app->run();
+} catch (Exception $exception) {
+    $prompt->error($exception->getMessage());
+    exit(1);
+}
+
+$prompt->success('Field generated successfully.');
+$prompt->success("The field can be found at {$path['field']}");
diff --git a/src/CLIPrompt.php b/src/CLIPrompt.php
index 5bd6e75..2cf4fdf 100644
--- a/src/CLIPrompt.php
+++ b/src/CLIPrompt.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FieldGenerator\Src;
+namespace StatonLab\FieldGenerator;
 
 /**
  * Class CLIPrompt.
@@ -13,14 +13,14 @@ class CLIPrompt
     /**
      * Input File Resource.
      *
-     * @var bool|resource
+     * @var Resource
      */
     protected $input;
 
     /**
      * Holds the prompt colors generator.
      *
-     * @var \FieldGenerator\Src\Colors
+     * @var \StatonLab\FieldGenerator\Colors
      */
     protected $colored;
 
diff --git a/src/Colors.php b/src/Colors.php
index c5f7cb9..c7e7fbf 100644
--- a/src/Colors.php
+++ b/src/Colors.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FieldGenerator\Src;
+namespace StatonLab\FieldGenerator;
 
 class Colors
 {
diff --git a/src/Generator.php b/src/Generator.php
index 3cd011c..143d4bc 100644
--- a/src/Generator.php
+++ b/src/Generator.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FieldGenerator\Src;
+namespace StatonLab\FieldGenerator;
 
 use Exception;
 
@@ -72,7 +72,7 @@ class Generator
     /**
      * Holds the prompt output/input handler.
      *
-     * @var \FieldGenerator\Src\CLIPrompt
+     * @var \StatonLab\FieldGenerator\CLIPrompt
      */
     protected $prompt;
 
@@ -91,7 +91,7 @@ class Generator
     /**
      * CLI Options Parser.
      *
-     * @var \FieldGenerator\Src\OptionsParser
+     * @var \StatonLab\FieldGenerator\OptionsParser
      */
     protected $options;
 
@@ -276,7 +276,7 @@ protected function createFromOutputPath()
     /**
      * Give public access to the prompt.
      *
-     * @return \FieldGenerator\Src\CLIPrompt
+     * @return \StatonLab\FieldGenerator\CLIPrompt
      */
     public function prompt()
     {
diff --git a/src/OptionsParser.php b/src/OptionsParser.php
index 03602c6..73111eb 100644
--- a/src/OptionsParser.php
+++ b/src/OptionsParser.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace FieldGenerator\Src;
+namespace StatonLab\FieldGenerator;
 
 class OptionsParser
 {