diff --git a/README.md b/README.md
index 340510e..c5632a8 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ Fast and small content management system written in PHP!
 2. Donate to keep Monstra free. We will add you to Monstra [Sponsors Page.](http://monstra.org/about/sponsors)
 3. Develop a new plugin.
 4. Create a new theme.
-5. Find and [report issues.](https://github.com/Awilum/monstra-cms/issues)
+5. Find and [report issues.](https://github.com/Monstra/monstra-cms/issues)
 6. Link back to [Monstra](http://monstra.org).
 
 
diff --git a/engine/Core.php b/engine/Core.php
index 7817c1a..742fa76 100644
--- a/engine/Core.php
+++ b/engine/Core.php
@@ -114,7 +114,7 @@ class Core
 
         // Init ORM
         if (defined('MONSTRA_DB_DSN')) {
-            require_once(ROOT . '/engine/Orm.php');
+            require_once(ROOT . '/libraries/Idiorm/Idiorm.php');
             Orm::configure(MONSTRA_DB_DSN);
             Orm::configure('username', MONSTRA_DB_USER);
             Orm::configure('password',  MONSTRA_DB_PASSWORD);
diff --git a/engine/Security.php b/engine/Security.php
index 164f6e4..6f21de7 100644
--- a/engine/Security.php
+++ b/engine/Security.php
@@ -1,4 +1,4 @@
-<?php
+<?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
  * Monstra Library
diff --git a/engine/Uri.php b/engine/Uri.php
index 30e78d6..b8ac54d 100644
--- a/engine/Uri.php
+++ b/engine/Uri.php
@@ -1,7 +1,7 @@
-<?php
+<?php defined('MONSTRA_ACCESS') or die('No direct script access.');
 
 /**
- * Monstra Library
+ * Monstra URI Module
  *
  * This source file is part of the Monstra Library. More information,
  * documentation and tutorials can be found at http://library.monstra.org
diff --git a/index.php b/index.php
index 1e40375..62442d3 100644
--- a/index.php
+++ b/index.php
@@ -61,5 +61,4 @@ if (file_exists('install.php')) {
 
     // Flush (send) the output buffer and turn off output buffering
     ob_end_flush();
-
 }
diff --git a/libraries/Gelato/Gelato.php b/libraries/Gelato/Gelato.php
index c5b8b41..63c6996 100644
--- a/libraries/Gelato/Gelato.php
+++ b/libraries/Gelato/Gelato.php
@@ -14,17 +14,17 @@
  */
 
 /**
- * Should we use the Monstra Autoloader to ensure the dependancies are automatically
+ * Should we use the Gelato Autoloader to ensure the dependancies are automatically
  * loaded?
  */
-if ( ! defined('GELATO_LIBRARY_AUTOLOADER')) {
-    define('GELATO_LIBRARY_AUTOLOADER', true);
+if ( ! defined('GELATO_AUTOLOADER')) {
+    define('GELATO_AUTOLOADER', true);
 }
 
 /**
  * Register autoload function
  */
-if (GELATO_LIBRARY_AUTOLOADER) {
+if (GELATO_AUTOLOADER) {
     spl_autoload_register(array('Gelato', 'autoload'));
 }
 
@@ -35,7 +35,7 @@ class Gelato
 {
 
     /**
-     * The version of Monstra
+     * The version of Gelato
      */
     const VERSION = '1.0.0';
 
diff --git a/libraries/Gelato/docs/README.md b/libraries/Gelato/docs/README.md
index 24e6cd8..f762436 100644
--- a/libraries/Gelato/docs/README.md
+++ b/libraries/Gelato/docs/README.md
@@ -1,9 +1,9 @@
-# Monstra Library
+# Gelato Library
 
-Monstra is a PHP5 library for web applications.
+Gelato is a PHP5 library for kickass Web Applications.
 
 ## Links
-- [Site](http://library.monstra.org)
-- [Github Repository](https://github.com/Monstra/monstra-library)
+- [Site](http://gelato.monstra.org)
+- [Github Repository](https://github.com/Monstra/gelato-library)
 
-Copyright (C) 2012-2013 Romanenko Sergey / Awilum [awilum@msn.com]
\ No newline at end of file
+Copyright (C) 2013 Romanenko Sergey / Awilum [awilum@msn.com]
\ No newline at end of file
diff --git a/engine/Orm.php b/libraries/Idiorm/Idiorm.php
similarity index 99%
rename from engine/Orm.php
rename to libraries/Idiorm/Idiorm.php
index dce1ff3..df404a8 100644
--- a/engine/Orm.php
+++ b/libraries/Idiorm/Idiorm.php
@@ -38,7 +38,7 @@
  *
  */
 
-class Orm
+class orm
 {
     // ----------------------- //
     // --- CLASS CONSTANTS --- //
diff --git a/robots.txt b/robots.txt
index b7bb6ee..b2b9059 100644
--- a/robots.txt
+++ b/robots.txt
@@ -1,4 +1,5 @@
 User-agent: *
 Disallow: /admin/
-Disallow: /monstra/
+Disallow: /engine/
+Disallow: /libraries/
 Disallow: /plugins/
\ No newline at end of file