diff --git a/README.md b/README.md
index 5e3c34a..02b9e1b 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,6 @@
-[![License](https://img.shields.io/github/license/ImpressCMS/impresscms-module-imbuilding.svg?maxAge=2592000)](License.txt) 
-	[![GitHub release](https://img.shields.io/github/release/ImpressCMS/impresscms-module-imbuilding.svg?maxAge=2592000)](https://github.com/ImpressCMS/impresscms-module-imbuilding/releases) 
-		[![This is ImpressCMS module](https://img.shields.io/badge/ImpressCMS-module-F3AC03.svg?maxAge=2592000)](http://impresscms.org)
+[![License](https://img.shields.io/github/license/ImpressModules/imbuilding.svg)](License.txt) [![GitHub release](https://img.shields.io/github/release/ImpressModules/imbuilding.svg)](https://github.com/ImpressModules/imbuilding/releases) [![This is ImpressCMS module](https://img.shields.io/badge/ImpressCMS-module-F3AC03.svg)](http://impresscms.org)
 
-#imBuilding
-Module to generate base code of new modules  :-)
+# imBuilding
+
+Module to generate base code for new [ImpressCMS](https://impresscms.org) modules.
 
diff --git a/SUMMARY.md b/SUMMARY.md
deleted file mode 100644
index df6f151..0000000
--- a/SUMMARY.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Summary
-
-
diff --git a/basemodule/basefiles/templates/blocks/index.html b/basemodule/basefiles/templates/blocks/index.html
old mode 100755
new mode 100644
diff --git a/book.json b/book.json
deleted file mode 100644
index e9c87ad..0000000
--- a/book.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "plugins": [
-        "add-header"
-    ],
-    "pluginsConfig": {}
-}
\ No newline at end of file
diff --git a/composer.json b/composer.json
index 92d7e68..78d7a9d 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,7 @@
   "name": "impresscms/impresscms-module-imbuilding",
   "description": "A module to help you jumpstart development of ImpressCMS modules",
   "minimum-stability": "beta",
-  "license": "GPL",
+  "license": "gpl-2.0-or-later",
   "authors": [
     {
       "name": "David Janssens (fiammybe)",
diff --git a/icms_version.php b/icms_version.php
index 5a7e532..5826bec 100644
--- a/icms_version.php
+++ b/icms_version.php
@@ -17,14 +17,14 @@
 $modversion = array(
 /**  General Information  */
 	"name"						=> _MI_IMBUILDING_MD_NAME,
-	"version"					=> 2.0,
+	"version"					=> 2.1,
 	"description"				=> _MI_IMBUILDING_MD_DESC,
 	"author"					=> "The SmartFactory",
 	"credits"					=> "INBOX International inc.",
 	"help"						=> "",
 	"license"					=> "GNU General Public License (GPL)",
 	"official"					=> 1,
-	"dirname"					=> basename(dirname(__FILE__)),
+	"dirname"					=> basename(__DIR__),
 	"modname"					=> "imbuilding",
 
 /**  Images information  */
@@ -35,7 +35,7 @@
 /**  Development information */
 	"status_version"			=> "Final",
 	"status"					=> "Final",
-	"date"						=> "18 Sept 2011",
+	"date"						=> date('Y-m-d', filemtime(__FILE__)),
 	"author_word"				=> "",
 	"warning"					=> _CO_ICMS_WARNING_FINAL,
 
@@ -43,7 +43,7 @@
 	"developer_website_url"		=> "http://inboxinternational.com",
 	"developer_website_name"	=> "INBOX International inc.",
 	"developer_email"			=> "info@inboxintl.com",
-		
+
 /** Administrative information */
 	"hasAdmin"					=> 1,
 	"adminindex"				=> "admin/index.php",
@@ -76,4 +76,5 @@
 	array("file" => "imbuilding_admin_module.html", "description" => "Module admin template"),
 	array("file" => "imbuilding_admin_object.html", "description" => "Object Admin template"),
 	array("file" => "imbuilding_admin_field.html", "description" => "Field Admin template"),
-	array("file" => "imbuilding_requirements.html", "description" => "Requirements"));
\ No newline at end of file
+	array("file" => "imbuilding_requirements.html", "description" => "Requirements")
+);
\ No newline at end of file
diff --git a/include/common.php b/include/common.php
index 5491c93..8428156 100644
--- a/include/common.php
+++ b/include/common.php
@@ -11,7 +11,7 @@
 
 defined("ICMS_ROOT_PATH") or die("ICMS root path not defined");
 
-if (!defined("IMBUILDING_DIRNAME")) define("IMBUILDING_DIRNAME", $modversion["dirname"] = basename(dirname(dirname(__FILE__))));
+if (!defined("IMBUILDING_DIRNAME")) define("IMBUILDING_DIRNAME", $modversion["dirname"] = basename(dirname(__FILE__, 2)));
 if (!defined("IMBUILDING_URL")) define("IMBUILDING_URL", ICMS_URL . "/modules/" . IMBUILDING_DIRNAME . "/");
 if (!defined("IMBUILDING_ROOT_PATH")) define("IMBUILDING_ROOT_PATH", ICMS_ROOT_PATH . "/modules/" . IMBUILDING_DIRNAME . "/");
 if (!defined("IMBUILDING_IMAGES_URL")) define("IMBUILDING_IMAGES_URL", IMBUILDING_URL . "images/");