diff --git a/composer.json b/composer.json
index feffc6b..889d8f3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,31 +1,33 @@
 {
-    "name": "laravelbook/ardent",
-    "description": "Self-validating smart models for Laravel 4's Eloquent O/RM",
+    "name": "laravel-ardent/ardent",
+    "description": "Self-validating smart models for Laravel 5's Eloquent ORM",
     "keywords": ["validation", "laravel", "framework", "eloquent", "database", "sql", "orm", "activerecord", "active record"],
     "type": "library",
-    "homepage": "http://laravelbook.com/",
     "license": "BSD-3-Clause",
     "authors": [
         {
             "name": "Igor Santos",
-            "homepage": "http://www.igorsantos.com.br",
+            "homepage": "http://igorsantos.com.br",
             "email": "igorsantos07@gmail.com",
-            "role": "Developer"
+            "role": "Maintainer"
+        },
+        {
+            "name": "Max Ehsan",
+            "role": "Original developer"
         }
     ],
     "support": {
-        "issues": "https://github.com/laravelbook/ardent/issues",
-        "email": "contact@laravelbook.com"
+        "issues": "https://github.com/laravelbook/ardent/issues"
     },
     "require": {
-        "php": ">=5.3.0",
-        "illuminate/support": "~4.1",
-        "illuminate/database": "~4.1",
-        "illuminate/validation": "~4.1"
+        "illuminate/support": "~5.1",
+        "illuminate/database": "~5.1",
+        "illuminate/validation": "~5.1",
+        "illuminate/events": "~5.1"
     },
     "autoload": {
-        "psr-0": {
-            "LaravelBook\\Ardent": "src/"
+        "psr-4": {
+            "LaravelArdent\\Ardent": "src/"
         }
     },
     "minimum-stability": "dev"
diff --git a/src/LaravelBook/Ardent/Ardent.php b/src/Ardent/Ardent.php
similarity index 99%
rename from src/LaravelBook/Ardent/Ardent.php
rename to src/Ardent/Ardent.php
index f062029..6d35cdc 100755
--- a/src/LaravelBook/Ardent/Ardent.php
+++ b/src/Ardent/Ardent.php
@@ -1,9 +1,9 @@
-<?php namespace LaravelBook\Ardent;
+<?php namespace LaravelArdent\Ardent;
 
 /*
  * This file is part of the Ardent package.
  *
- * (c) Max Ehsan <contact@laravelbook.com>
+ * (c) Max Ehsan <contact@LaravelArdent.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
@@ -222,7 +222,7 @@ abstract class Ardent extends Model {
      * Create a new Ardent model instance.
      *
      * @param array $attributes
-     * @return \LaravelBook\Ardent\Ardent
+     * @return \LaravelArdent\Ardent\Ardent
      */
     public function __construct(array $attributes = array()) {
         parent::__construct($attributes);
diff --git a/src/LaravelBook/Ardent/Builder.php b/src/Ardent/Builder.php
similarity index 96%
rename from src/LaravelBook/Ardent/Builder.php
rename to src/Ardent/Builder.php
index 241d15a..fe78f20 100644
--- a/src/LaravelBook/Ardent/Builder.php
+++ b/src/Ardent/Builder.php
@@ -1,5 +1,5 @@
 <?php
-namespace LaravelBook\Ardent;
+namespace LaravelArdent\Ardent;
 
 class Builder extends \Illuminate\Database\Eloquent\Builder {
 
diff --git a/src/LaravelBook/Ardent/Facades/Ardent.php b/src/Ardent/Facades/Ardent.php
similarity index 81%
rename from src/LaravelBook/Ardent/Facades/Ardent.php
rename to src/Ardent/Facades/Ardent.php
index 05da1de..a84f433 100644
--- a/src/LaravelBook/Ardent/Facades/Ardent.php
+++ b/src/Ardent/Facades/Ardent.php
@@ -1,9 +1,9 @@
-<?php namespace LaravelBook\Ardent\Facades;
+<?php namespace LaravelArdent\Ardent\Facades;
 
 /*
  * This file is part of the Ardent package.
  *
- * (c) Max Ehsan <contact@laravelbook.com>
+ * (c) Max Ehsan <contact@LaravelArdent.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
diff --git a/src/LaravelBook/Ardent/InvalidModelException.php b/src/Ardent/InvalidModelException.php
similarity index 89%
rename from src/LaravelBook/Ardent/InvalidModelException.php
rename to src/Ardent/InvalidModelException.php
index 649e67e..b2d7b10 100644
--- a/src/LaravelBook/Ardent/InvalidModelException.php
+++ b/src/Ardent/InvalidModelException.php
@@ -1,15 +1,15 @@
-<?php namespace LaravelBook\Ardent;
+<?php namespace LaravelArdent\Ardent;
 
 /**
  * Used when validation fails. Contains the invalid model for easy analysis.
  * Class InvalidModelException
- * @package LaravelBook\Ardent
+ * @package LaravelArdent\Ardent
  */
 class InvalidModelException extends \RuntimeException {
 
 	/**
 	 * The invalid model.
-	 * @var \LaravelBook\Ardent\Ardent
+	 * @var \LaravelArdent\Ardent\Ardent
 	 */
 	protected $model;
 
diff --git a/src/LaravelBook/Ardent/Providers/ArdentServiceProvider.php b/src/Ardent/Providers/ArdentServiceProvider.php
similarity index 81%
rename from src/LaravelBook/Ardent/Providers/ArdentServiceProvider.php
rename to src/Ardent/Providers/ArdentServiceProvider.php
index d950d2b..e7f1d75 100644
--- a/src/LaravelBook/Ardent/Providers/ArdentServiceProvider.php
+++ b/src/Ardent/Providers/ArdentServiceProvider.php
@@ -1,16 +1,16 @@
-<?php namespace LaravelBook\Ardent\Providers;
+<?php namespace LaravelArdent\Ardent\Providers;
 
 /*
  * This file is part of the Ardent package.
  *
- * (c) Max Ehsan <contact@laravelbook.com>
+ * (c) Max Ehsan <contact@LaravelArdent.com>
  *
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  */
 
 use Illuminate\Support\ServiceProvider;
-use LaravelBook\Ardent\Ardent;
+use LaravelArdent\Ardent\Ardent;
 
 class ArdentServiceProvider extends ServiceProvider {
 
@@ -28,7 +28,7 @@ class ArdentServiceProvider extends ServiceProvider {
 	 */
 	public function boot()
 	{
-		$this->package('laravelbook/ardent');
+		$this->package('LaravelArdent/ardent');
 	}
 
 	/**
diff --git a/src/LaravelBook/lang/en/validation.php b/src/lang/en/validation.php
similarity index 100%
rename from src/LaravelBook/lang/en/validation.php
rename to src/lang/en/validation.php
diff --git a/src/LaravelBook/lang/pt-br/validation.php b/src/lang/pt-br/validation.php
similarity index 100%
rename from src/LaravelBook/lang/pt-br/validation.php
rename to src/lang/pt-br/validation.php