diff --git a/README.md b/README.md
index 092632b..928da6c 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,5 @@
-##Templado CLI
+## Templado CLI
 
-CLI Wrapper for [Templado](https://github.com/theseer/templado).
+CLI Wrapper for [Templado](https://github.com/templado/engine).
 
+Templado CLI 
diff --git a/composer.json b/composer.json
index 4bf78f1..3efc53b 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-  "name" : "theseer/templado-cli",
+  "name" : "templado/cli",
   "description" : "CLI tools for Templado",
   "license" : "BSD-3-Clause",
   "authors" : [
@@ -10,12 +10,12 @@
     }
   ],
   "support" : {
-    "issues" : "https://github.com/theseer/templado-cli/issues"
+    "issues" : "https://github.com/templado/cli/issues"
   },
   "require" : {
     "php" : "^7.0",
     "ext-dom" : "*",
-    "theseer/templado": "^1.0"
+    "templado/engine": "^1.0"
   },
   "autoload": {
     "classmap": [
diff --git a/src/Directory.php b/src/Directory.php
index f2320d6..dd87a72 100644
--- a/src/Directory.php
+++ b/src/Directory.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 use RecursiveDirectoryIterator;
 use RecursiveIteratorIterator;
diff --git a/src/DirectoryException.php b/src/DirectoryException.php
index e358615..71f26f2 100644
--- a/src/DirectoryException.php
+++ b/src/DirectoryException.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class DirectoryException extends Exception {
 
diff --git a/src/Exception.php b/src/Exception.php
index fe457cf..5db73a1 100644
--- a/src/Exception.php
+++ b/src/Exception.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class Exception extends \Exception {
 }
diff --git a/src/Factory.php b/src/Factory.php
index 2a683c2..16a9f10 100644
--- a/src/Factory.php
+++ b/src/Factory.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class Factory {
     /**
diff --git a/src/Generator.php b/src/Generator.php
index ab8e8a3..0b15139 100644
--- a/src/Generator.php
+++ b/src/Generator.php
@@ -1,11 +1,11 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
-use TheSeer\Templado\AssetListCollection;
-use TheSeer\Templado\AssetLoader;
-use TheSeer\Templado\AssetLoaderException;
-use TheSeer\Templado\FileName;
-use TheSeer\Templado\Templado;
+use Templado\Engine\AssetListCollection;
+use Templado\Engine\AssetLoader;
+use Templado\Engine\AssetLoaderException;
+use Templado\Engine\FileName;
+use Templado\Engine\Templado;
 
 class Generator {
 
diff --git a/src/GeneratorConfig.php b/src/GeneratorConfig.php
index 36e064f..06b9c8c 100644
--- a/src/GeneratorConfig.php
+++ b/src/GeneratorConfig.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class GeneratorConfig {
 
diff --git a/src/Request.php b/src/Request.php
index e5233a2..91373de 100644
--- a/src/Request.php
+++ b/src/Request.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class Request {
 
diff --git a/src/RequestException.php b/src/RequestException.php
index b97b521..a0ef034 100644
--- a/src/RequestException.php
+++ b/src/RequestException.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class RequestException extends Exception {
 
diff --git a/src/Runner.php b/src/Runner.php
index b1b746f..8b7bfe2 100644
--- a/src/Runner.php
+++ b/src/Runner.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class Runner {
 
diff --git a/src/autoload.php b/src/autoload.php
index ca29739..3bf2948 100644
--- a/src/autoload.php
+++ b/src/autoload.php
@@ -7,21 +7,21 @@ function($class) {
         static $classes = null;
         if ($classes === null) {
             $classes = array(
-                'theseer\\templado\\cli\\directory' => '/Directory.php',
-                'theseer\\templado\\cli\\directoryexception' => '/DirectoryException.php',
-                'theseer\\templado\\cli\\exception' => '/Exception.php',
-                'theseer\\templado\\cli\\factory' => '/Factory.php',
-                'theseer\\templado\\cli\\generator' => '/Generator.php',
-                'theseer\\templado\\cli\\generatorconfig' => '/GeneratorConfig.php',
-                'theseer\\templado\\cli\\gitversion' => '/version/GitVersion.php',
-                'theseer\\templado\\cli\\logger' => '/logger/Logger.php',
-                'theseer\\templado\\cli\\request' => '/Request.php',
-                'theseer\\templado\\cli\\requestexception' => '/RequestException.php',
-                'theseer\\templado\\cli\\runner' => '/Runner.php',
-                'theseer\\templado\\cli\\silentlogger' => '/logger/SilentLogger.php',
-                'theseer\\templado\\cli\\staticversion' => '/version/StaticVersion.php',
-                'theseer\\templado\\cli\\verboselogger' => '/logger/VerboseLogger.php',
-                'theseer\\templado\\cli\\version' => '/version/Version.php'
+                'templado\\cli\\directory' => '/Directory.php',
+                'templado\\cli\\directoryexception' => '/DirectoryException.php',
+                'templado\\cli\\exception' => '/Exception.php',
+                'templado\\cli\\factory' => '/Factory.php',
+                'templado\\cli\\generator' => '/Generator.php',
+                'templado\\cli\\generatorconfig' => '/GeneratorConfig.php',
+                'templado\\cli\\gitversion' => '/version/GitVersion.php',
+                'templado\\cli\\logger' => '/logger/Logger.php',
+                'templado\\cli\\request' => '/Request.php',
+                'templado\\cli\\requestexception' => '/RequestException.php',
+                'templado\\cli\\runner' => '/Runner.php',
+                'templado\\cli\\silentlogger' => '/logger/SilentLogger.php',
+                'templado\\cli\\staticversion' => '/version/StaticVersion.php',
+                'templado\\cli\\verboselogger' => '/logger/VerboseLogger.php',
+                'templado\\cli\\version' => '/version/Version.php'
             );
         }
         $cn = strtolower($class);
diff --git a/src/logger/Logger.php b/src/logger/Logger.php
index d22dbe5..eef4fae 100644
--- a/src/logger/Logger.php
+++ b/src/logger/Logger.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 interface Logger {
 
diff --git a/src/logger/SilentLogger.php b/src/logger/SilentLogger.php
index b7cb829..fd23b4d 100644
--- a/src/logger/SilentLogger.php
+++ b/src/logger/SilentLogger.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class SilentLogger implements Logger {
 
diff --git a/src/logger/VerboseLogger.php b/src/logger/VerboseLogger.php
index ded3e66..395bbd2 100644
--- a/src/logger/VerboseLogger.php
+++ b/src/logger/VerboseLogger.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class VerboseLogger implements Logger {
 
diff --git a/src/version/GitVersion.php b/src/version/GitVersion.php
index e7ea7c4..7e5dadd 100644
--- a/src/version/GitVersion.php
+++ b/src/version/GitVersion.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class GitVersion implements Version  {
 
diff --git a/src/version/StaticVersion.php b/src/version/StaticVersion.php
index a249ebd..9668104 100644
--- a/src/version/StaticVersion.php
+++ b/src/version/StaticVersion.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 class StaticVersion implements Version {
 
diff --git a/src/version/Version.php b/src/version/Version.php
index 486e41c..f4ac24a 100644
--- a/src/version/Version.php
+++ b/src/version/Version.php
@@ -1,5 +1,5 @@
 <?php declare(strict_types = 1);
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 interface Version {
     public function asString(): string;
diff --git a/templado b/templado
index 7b32e94..f4fc228 100755
--- a/templado
+++ b/templado
@@ -31,7 +31,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  *
  */
-namespace TheSeer\Templado\Cli;
+namespace Templado\Cli;
 
 if (!defined('HHVM_VERSION') && (version_compare(phpversion(), '7.0', 'lt'))) {
     fwrite(