diff --git a/README.md b/README.md
index 0f9555a..2c16802 100644
--- a/README.md
+++ b/README.md
@@ -25,35 +25,11 @@ Codebox Plus alows you to:
 
 ## Requirement
 
-php: >=5.3.3
-
-phpbb: 3.1.*@dev
+phpbb: 3.1.x
 
 ## Installation
 
-Copy ```./ext/o0johntam0o/codebox_plus/*``` to ```<phpBB root>/ext/o0johntam0o/codebox_plus/*```
-
-## Note
-
-* For security purpose, please don't put any private infomation into the BBCode [CODE][/CODE]
-
-* Usage:
-
-[CODE={language} file={filename}]{code}[/CODE] (with specified filename and language)
-
-[CODE={language}]{code}[/CODE] (without filename, default filename is "Untitled.txt")
-
-[CODE file={filename}]{code}[/CODE] (without language, default language is "Plain text")
-
-[CODE]{code}[/CODE] (using default filename - Untitled.txt and default language - Plain text)
-
-
-{language} is as the same with the filename of the language file (in root/includes/geshi/geshi/)
-
-
-To update the GeSHi parser, just replace the folder ./includes/geshi/ with the new one (current version is 1.0.8.11).
-
-I do not own any files under the folder root/includes/geshi/. More information about the authors can be found at http://qbnz.com/highlighter/
+Copy ```./ext/o0johntam0o/codeboxplus/*``` to ```<phpBB root>/ext/o0johntam0o/codeboxplus/*```
 
 ## License
 
diff --git a/ext/o0johntam0o/codebox_plus/acp/main_info.php b/ext/o0johntam0o/codeboxplus/acp/main_info.php
similarity index 83%
rename from ext/o0johntam0o/codebox_plus/acp/main_info.php
rename to ext/o0johntam0o/codeboxplus/acp/main_info.php
index 8d1cad2..a6671c3 100644
--- a/ext/o0johntam0o/codebox_plus/acp/main_info.php
+++ b/ext/o0johntam0o/codeboxplus/acp/main_info.php
@@ -8,14 +8,14 @@
 *
 */
 
-namespace o0johntam0o\codebox_plus\acp;
+namespace o0johntam0o\codeboxplus\acp;
 
 class main_info
 {
 	function module()
 	{
 		return array(
-			'filename'	=> '\o0johntam0o\codebox_plus\acp\main_module',
+			'filename'	=> '\o0johntam0o\codeboxplus\acp\main_module',
 			'title'		=> 'CODEBOX_PLUS_TITLE',
 			'version'	=> '1.0.0',
 			'modes'		=> array(
diff --git a/ext/o0johntam0o/codebox_plus/acp/main_module.php b/ext/o0johntam0o/codeboxplus/acp/main_module.php
similarity index 98%
rename from ext/o0johntam0o/codebox_plus/acp/main_module.php
rename to ext/o0johntam0o/codeboxplus/acp/main_module.php
index 335975d..d54d372 100644
--- a/ext/o0johntam0o/codebox_plus/acp/main_module.php
+++ b/ext/o0johntam0o/codeboxplus/acp/main_module.php
@@ -8,7 +8,7 @@
 *
 */
 
-namespace o0johntam0o\codebox_plus\acp;
+namespace o0johntam0o\codeboxplus\acp;
 
 class main_module
 {
diff --git a/ext/o0johntam0o/codebox_plus/adm/style/acp_codebox_plus.html b/ext/o0johntam0o/codeboxplus/adm/style/acp_codebox_plus.html
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/adm/style/acp_codebox_plus.html
rename to ext/o0johntam0o/codeboxplus/adm/style/acp_codebox_plus.html
diff --git a/ext/o0johntam0o/codebox_plus/composer.json b/ext/o0johntam0o/codeboxplus/composer.json
similarity index 94%
rename from ext/o0johntam0o/codebox_plus/composer.json
rename to ext/o0johntam0o/codeboxplus/composer.json
index 8c6d217..ddfb065 100644
--- a/ext/o0johntam0o/codebox_plus/composer.json
+++ b/ext/o0johntam0o/codeboxplus/composer.json
@@ -1,5 +1,5 @@
 {
-	"name": "o0johntam0o/codebox_plus",
+	"name": "o0johntam0o/codeboxplus",
 	"type": "phpbb-extension",
 	"description": "Syntax highlighting 200+ programming languages (using GeSHi); Expand/collapse code block; Downloading code contents.",
 	"homepage": "https://github.com/o0johntam0o/phpBB-Extension-Codebox-Plus",
diff --git a/ext/o0johntam0o/codebox_plus/config/routing.yml b/ext/o0johntam0o/codeboxplus/config/routing.yml
similarity index 53%
rename from ext/o0johntam0o/codebox_plus/config/routing.yml
rename to ext/o0johntam0o/codeboxplus/config/routing.yml
index 449b70a..80279e1 100644
--- a/ext/o0johntam0o/codebox_plus/config/routing.yml
+++ b/ext/o0johntam0o/codeboxplus/config/routing.yml
@@ -1,10 +1,10 @@
 codebox_plus_base_controller:
     pattern: /codebox_plus
-    defaults: { _controller: o0johntam0o.codebox_plus.controller:base }
+    defaults: { _controller: o0johntam0o.codeboxplus.controller:base }
 
 codebox_plus_download_controller:
     pattern: /codebox_plus/download/{id}-{part}
-    defaults: { _controller: o0johntam0o.codebox_plus.controller:downloader, id:0, part:0 }
+    defaults: { _controller: o0johntam0o.codeboxplus.controller:downloader, id:0, part:0 }
     requirements:
         id: \d+
         part: \d+
diff --git a/ext/o0johntam0o/codebox_plus/config/services.yml b/ext/o0johntam0o/codeboxplus/config/services.yml
similarity index 71%
rename from ext/o0johntam0o/codebox_plus/config/services.yml
rename to ext/o0johntam0o/codeboxplus/config/services.yml
index 8d9ce11..7524d69 100644
--- a/ext/o0johntam0o/codebox_plus/config/services.yml
+++ b/ext/o0johntam0o/codeboxplus/config/services.yml
@@ -1,6 +1,6 @@
 services:
-    o0johntam0o.codebox_plus.controller:
-        class: o0johntam0o\codebox_plus\controller\main
+    o0johntam0o.codeboxplus.controller:
+        class: o0johntam0o\codeboxplus\controller\main
         arguments:
             - @controller.helper
             - @template
@@ -12,8 +12,8 @@ services:
             - %core.root_path%
             - %core.php_ext%
 
-    o0johntam0o.codebox_plus.listener:
-        class: o0johntam0o\codebox_plus\event\main_listener
+    o0johntam0o.codeboxplus.listener:
+        class: o0johntam0o\codeboxplus\event\main_listener
         arguments:
             - @controller.helper
             - @template
diff --git a/ext/o0johntam0o/codebox_plus/controller/main.php b/ext/o0johntam0o/codeboxplus/controller/main.php
similarity index 99%
rename from ext/o0johntam0o/codebox_plus/controller/main.php
rename to ext/o0johntam0o/codeboxplus/controller/main.php
index 2fe39d4..8185cff 100644
--- a/ext/o0johntam0o/codebox_plus/controller/main.php
+++ b/ext/o0johntam0o/codeboxplus/controller/main.php
@@ -8,7 +8,7 @@
 *
 */
 // TODO: IMPROVE ANTI-SPAM FEATURE
-namespace o0johntam0o\codebox_plus\controller;
+namespace o0johntam0o\codeboxplus\controller;
 
 class main
 {
diff --git a/ext/o0johntam0o/codebox_plus/event/main_listener.php b/ext/o0johntam0o/codeboxplus/event/main_listener.php
similarity index 97%
rename from ext/o0johntam0o/codebox_plus/event/main_listener.php
rename to ext/o0johntam0o/codeboxplus/event/main_listener.php
index 34f12dc..a568ab9 100644
--- a/ext/o0johntam0o/codebox_plus/event/main_listener.php
+++ b/ext/o0johntam0o/codeboxplus/event/main_listener.php
@@ -8,7 +8,7 @@
 *
 */
 // TO-DO: VALIDATE HTML
-namespace o0johntam0o\codebox_plus\event;
+namespace o0johntam0o\codeboxplus\event;
 
 /**
 * @ignore
@@ -51,7 +51,7 @@ public function load_language_on_setup($event)
     {
         $lang_set_ext = $event['lang_set_ext'];
         $lang_set_ext[] = array(
-            'ext_name' => 'o0johntam0o/codebox_plus',
+            'ext_name' => 'o0johntam0o/codeboxplus',
             'lang_set' => 'codebox_plus',
         );
         $event['lang_set_ext'] = $lang_set_ext;
@@ -233,7 +233,7 @@ private function codebox_parse_code($code = '', $lang = 'text')
 		// GeSHi
 		if (!class_exists("GeSHi"))
 		{
-			include($this->root_path . 'ext/o0johntam0o/codebox_plus/includes/geshi/geshi.' . $this->php_ext);
+			include($this->root_path . 'ext/o0johntam0o/codeboxplus/includes/geshi/geshi.' . $this->php_ext);
 		}
 		
 		$geshi = new \GeSHi($code, $lang);
diff --git a/ext/o0johntam0o/codebox_plus/ext.php b/ext/o0johntam0o/codeboxplus/ext.php
similarity index 87%
rename from ext/o0johntam0o/codebox_plus/ext.php
rename to ext/o0johntam0o/codeboxplus/ext.php
index 24fe9d4..7683fc0 100644
--- a/ext/o0johntam0o/codebox_plus/ext.php
+++ b/ext/o0johntam0o/codeboxplus/ext.php
@@ -8,7 +8,7 @@
 *
 */
 
-namespace o0johntam0o\codebox_plus;
+namespace o0johntam0o\codeboxplus;
 
 /**
 * @ignore
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/4cs.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/4cs.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/4cs.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/4cs.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/6502acme.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/6502acme.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/6502acme.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/6502acme.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/6502kickass.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/6502kickass.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/6502kickass.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/6502kickass.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/6502tasm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/6502tasm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/6502tasm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/6502tasm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/68000devpac.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/68000devpac.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/68000devpac.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/68000devpac.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/abap.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/abap.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/abap.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/abap.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/actionscript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/actionscript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/actionscript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/actionscript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/actionscript3.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/actionscript3.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/actionscript3.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/actionscript3.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ada.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ada.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ada.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ada.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/algol68.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/algol68.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/algol68.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/algol68.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/apache.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/apache.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/apache.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/apache.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/applescript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/applescript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/applescript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/applescript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/apt_sources.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/apt_sources.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/apt_sources.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/apt_sources.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/arm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/arm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/arm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/arm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/asm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/asm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/asm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/asm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/asp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/asp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/asp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/asp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/asymptote.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/asymptote.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/asymptote.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/asymptote.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/autoconf.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/autoconf.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/autoconf.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/autoconf.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/autohotkey.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/autohotkey.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/autohotkey.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/autohotkey.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/autoit.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/autoit.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/autoit.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/autoit.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/avisynth.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/avisynth.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/avisynth.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/avisynth.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/awk.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/awk.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/awk.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/awk.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bascomavr.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bascomavr.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bascomavr.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bascomavr.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bash.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bash.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bash.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bash.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/basic4gl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/basic4gl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/basic4gl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/basic4gl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bf.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bf.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bf.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bf.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bibtex.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bibtex.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bibtex.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bibtex.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/blitzbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/blitzbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/blitzbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/blitzbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bnf.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bnf.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/bnf.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/bnf.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/boo.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/boo.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/boo.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/boo.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/c.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/c.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/c.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/c.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/c_loadrunner.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/c_loadrunner.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/c_loadrunner.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/c_loadrunner.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/c_mac.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/c_mac.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/c_mac.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/c_mac.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/caddcl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/caddcl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/caddcl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/caddcl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cadlisp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cadlisp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cadlisp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cadlisp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cfdg.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cfdg.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cfdg.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cfdg.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cfm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cfm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cfm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cfm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/chaiscript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/chaiscript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/chaiscript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/chaiscript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cil.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cil.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cil.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cil.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/clojure.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/clojure.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/clojure.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/clojure.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cmake.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cmake.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cmake.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cmake.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cobol.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cobol.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cobol.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cobol.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/coffeescript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/coffeescript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/coffeescript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/coffeescript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cpp-qt.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cpp-qt.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cpp-qt.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cpp-qt.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cpp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cpp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cpp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cpp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/csharp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/csharp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/csharp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/csharp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/css.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/css.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/css.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/css.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cuesheet.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cuesheet.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/cuesheet.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/cuesheet.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/d.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/d.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/d.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/d.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dcl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dcl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dcl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dcl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dcpu16.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dcpu16.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dcpu16.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dcpu16.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dcs.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dcs.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dcs.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dcs.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/delphi.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/delphi.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/delphi.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/delphi.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/diff.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/diff.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/diff.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/diff.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/div.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/div.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/div.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/div.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dos.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dos.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dos.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dos.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dot.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dot.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/dot.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/dot.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/e.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/e.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/e.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/e.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ecmascript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ecmascript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ecmascript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ecmascript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/eiffel.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/eiffel.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/eiffel.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/eiffel.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/email.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/email.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/email.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/email.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/epc.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/epc.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/epc.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/epc.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/erlang.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/erlang.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/erlang.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/erlang.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/euphoria.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/euphoria.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/euphoria.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/euphoria.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/f1.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/f1.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/f1.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/f1.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/falcon.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/falcon.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/falcon.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/falcon.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/fo.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/fo.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/fo.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/fo.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/fortran.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/fortran.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/fortran.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/fortran.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/freebasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/freebasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/freebasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/freebasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/freeswitch.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/freeswitch.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/freeswitch.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/freeswitch.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/fsharp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/fsharp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/fsharp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/fsharp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gambas.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gambas.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gambas.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gambas.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gdb.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gdb.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gdb.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gdb.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/genero.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/genero.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/genero.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/genero.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/genie.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/genie.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/genie.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/genie.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gettext.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gettext.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gettext.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gettext.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/glsl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/glsl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/glsl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/glsl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gml.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gml.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gml.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gml.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gnuplot.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gnuplot.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gnuplot.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gnuplot.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/go.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/go.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/go.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/go.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/groovy.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/groovy.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/groovy.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/groovy.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gwbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gwbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/gwbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/gwbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/haskell.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/haskell.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/haskell.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/haskell.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/haxe.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/haxe.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/haxe.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/haxe.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/hicest.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/hicest.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/hicest.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/hicest.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/hq9plus.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/hq9plus.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/hq9plus.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/hq9plus.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/html4strict.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/html4strict.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/html4strict.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/html4strict.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/html5.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/html5.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/html5.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/html5.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/icon.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/icon.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/icon.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/icon.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/idl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/idl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/idl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/idl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/index.htm b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/index.htm
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/index.htm
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/index.htm
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ini.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ini.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ini.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ini.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/inno.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/inno.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/inno.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/inno.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/intercal.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/intercal.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/intercal.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/intercal.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/io.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/io.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/io.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/io.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/j.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/j.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/j.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/j.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/java.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/java.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/java.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/java.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/java5.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/java5.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/java5.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/java5.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/javascript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/javascript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/javascript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/javascript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/jquery.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/jquery.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/jquery.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/jquery.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/kixtart.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/kixtart.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/kixtart.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/kixtart.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/klonec.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/klonec.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/klonec.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/klonec.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/klonecpp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/klonecpp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/klonecpp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/klonecpp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/latex.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/latex.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/latex.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/latex.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lb.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lb.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lb.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lb.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ldif.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ldif.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ldif.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ldif.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lisp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lisp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lisp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lisp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/llvm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/llvm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/llvm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/llvm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/locobasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/locobasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/locobasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/locobasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/logtalk.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/logtalk.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/logtalk.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/logtalk.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lolcode.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lolcode.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lolcode.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lolcode.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lotusformulas.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lotusformulas.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lotusformulas.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lotusformulas.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lotusscript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lotusscript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lotusscript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lotusscript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lscript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lscript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lscript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lscript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lsl2.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lsl2.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lsl2.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lsl2.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lua.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lua.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/lua.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/lua.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/m68k.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/m68k.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/m68k.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/m68k.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/magiksf.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/magiksf.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/magiksf.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/magiksf.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/make.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/make.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/make.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/make.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mapbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mapbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mapbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mapbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/matlab.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/matlab.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/matlab.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/matlab.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mirc.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mirc.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mirc.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mirc.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mmix.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mmix.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mmix.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mmix.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/modula2.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/modula2.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/modula2.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/modula2.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/modula3.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/modula3.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/modula3.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/modula3.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mpasm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mpasm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mpasm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mpasm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mxml.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mxml.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mxml.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mxml.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mysql.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mysql.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/mysql.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/mysql.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/nagios.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/nagios.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/nagios.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/nagios.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/netrexx.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/netrexx.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/netrexx.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/netrexx.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/newlisp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/newlisp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/newlisp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/newlisp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/nsis.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/nsis.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/nsis.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/nsis.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oberon2.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oberon2.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oberon2.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oberon2.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/objc.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/objc.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/objc.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/objc.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/objeck.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/objeck.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/objeck.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/objeck.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ocaml-brief.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ocaml-brief.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ocaml-brief.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ocaml-brief.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ocaml.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ocaml.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ocaml.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ocaml.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/octave.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/octave.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/octave.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/octave.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oobas.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oobas.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oobas.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oobas.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oorexx.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oorexx.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oorexx.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oorexx.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oracle11.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oracle11.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oracle11.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oracle11.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oracle8.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oracle8.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oracle8.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oracle8.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oxygene.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oxygene.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oxygene.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oxygene.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oz.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oz.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/oz.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/oz.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/parasail.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/parasail.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/parasail.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/parasail.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/parigp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/parigp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/parigp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/parigp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pascal.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pascal.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pascal.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pascal.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pcre.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pcre.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pcre.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pcre.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/per.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/per.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/per.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/per.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/perl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/perl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/perl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/perl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/perl6.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/perl6.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/perl6.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/perl6.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pf.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pf.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pf.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pf.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/php-brief.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/php-brief.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/php-brief.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/php-brief.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/php.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/php.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/php.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/php.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pic16.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pic16.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pic16.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pic16.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pike.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pike.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pike.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pike.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pixelbender.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pixelbender.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pixelbender.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pixelbender.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pli.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pli.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pli.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pli.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/plsql.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/plsql.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/plsql.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/plsql.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/postgresql.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/postgresql.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/postgresql.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/postgresql.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/povray.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/povray.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/povray.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/povray.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/powerbuilder.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/powerbuilder.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/powerbuilder.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/powerbuilder.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/powershell.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/powershell.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/powershell.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/powershell.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/proftpd.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/proftpd.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/proftpd.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/proftpd.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/progress.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/progress.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/progress.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/progress.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/prolog.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/prolog.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/prolog.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/prolog.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/properties.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/properties.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/properties.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/properties.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/providex.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/providex.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/providex.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/providex.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/purebasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/purebasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/purebasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/purebasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pycon.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pycon.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pycon.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pycon.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pys60.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pys60.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/pys60.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/pys60.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/python.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/python.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/python.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/python.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/q.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/q.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/q.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/q.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/qbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/qbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/qbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/qbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rails.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rails.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rails.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rails.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rebol.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rebol.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rebol.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rebol.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/reg.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/reg.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/reg.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/reg.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rexx.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rexx.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rexx.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rexx.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/robots.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/robots.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/robots.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/robots.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rpmspec.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rpmspec.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rpmspec.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rpmspec.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rsplus.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rsplus.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/rsplus.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/rsplus.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ruby.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ruby.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/ruby.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/ruby.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sas.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sas.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sas.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sas.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/scala.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/scala.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/scala.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/scala.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/scheme.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/scheme.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/scheme.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/scheme.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/scilab.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/scilab.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/scilab.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/scilab.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sdlbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sdlbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sdlbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sdlbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/smalltalk.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/smalltalk.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/smalltalk.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/smalltalk.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/smarty.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/smarty.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/smarty.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/smarty.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/spark.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/spark.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/spark.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/spark.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sparql.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sparql.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sparql.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sparql.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sql.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sql.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/sql.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/sql.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/stonescript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/stonescript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/stonescript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/stonescript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/systemverilog.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/systemverilog.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/systemverilog.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/systemverilog.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/tcl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/tcl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/tcl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/tcl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/teraterm.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/teraterm.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/teraterm.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/teraterm.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/text.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/text.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/text.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/text.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/thinbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/thinbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/thinbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/thinbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/tsql.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/tsql.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/tsql.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/tsql.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/typoscript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/typoscript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/typoscript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/typoscript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/unicon.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/unicon.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/unicon.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/unicon.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/upc.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/upc.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/upc.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/upc.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/urbi.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/urbi.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/urbi.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/urbi.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/uscript.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/uscript.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/uscript.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/uscript.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vala.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vala.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vala.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vala.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vb.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vb.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vb.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vb.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vbnet.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vbnet.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vbnet.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vbnet.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vedit.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vedit.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vedit.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vedit.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/verilog.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/verilog.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/verilog.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/verilog.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vhdl.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vhdl.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vhdl.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vhdl.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vim.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vim.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/vim.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/vim.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/visualfoxpro.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/visualfoxpro.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/visualfoxpro.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/visualfoxpro.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/visualprolog.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/visualprolog.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/visualprolog.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/visualprolog.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/whitespace.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/whitespace.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/whitespace.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/whitespace.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/whois.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/whois.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/whois.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/whois.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/winbatch.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/winbatch.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/winbatch.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/winbatch.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xml.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xml.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xml.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xml.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xorg_conf.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xorg_conf.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xorg_conf.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xorg_conf.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xpp.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xpp.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/xpp.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/xpp.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/yaml.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/yaml.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/yaml.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/yaml.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/z80.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/z80.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/z80.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/z80.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/geshi/zxbasic.php b/ext/o0johntam0o/codeboxplus/includes/geshi/geshi/zxbasic.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/geshi/zxbasic.php
rename to ext/o0johntam0o/codeboxplus/includes/geshi/geshi/zxbasic.php
diff --git a/ext/o0johntam0o/codebox_plus/includes/geshi/index.htm b/ext/o0johntam0o/codeboxplus/includes/geshi/index.htm
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/includes/geshi/index.htm
rename to ext/o0johntam0o/codeboxplus/includes/geshi/index.htm
diff --git a/ext/o0johntam0o/codebox_plus/language/en/codebox_plus.php b/ext/o0johntam0o/codeboxplus/language/en/codebox_plus.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/language/en/codebox_plus.php
rename to ext/o0johntam0o/codeboxplus/language/en/codebox_plus.php
diff --git a/ext/o0johntam0o/codebox_plus/language/vi/codebox_plus.php b/ext/o0johntam0o/codeboxplus/language/vi/codebox_plus.php
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/language/vi/codebox_plus.php
rename to ext/o0johntam0o/codeboxplus/language/vi/codebox_plus.php
diff --git a/ext/o0johntam0o/codebox_plus/license.txt b/ext/o0johntam0o/codeboxplus/license.txt
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/license.txt
rename to ext/o0johntam0o/codeboxplus/license.txt
diff --git a/ext/o0johntam0o/codebox_plus/migrations/release_1_0_0.php b/ext/o0johntam0o/codeboxplus/migrations/release_1_0_0.php
similarity index 98%
rename from ext/o0johntam0o/codebox_plus/migrations/release_1_0_0.php
rename to ext/o0johntam0o/codeboxplus/migrations/release_1_0_0.php
index 4f9920e..4c71dae 100644
--- a/ext/o0johntam0o/codebox_plus/migrations/release_1_0_0.php
+++ b/ext/o0johntam0o/codeboxplus/migrations/release_1_0_0.php
@@ -8,7 +8,7 @@
 *
 */
 
-namespace o0johntam0o\codebox_plus\migrations;
+namespace o0johntam0o\codeboxplus\migrations;
 
 class release_1_0_0 extends \phpbb\db\migration\migration
 {
@@ -45,7 +45,7 @@ public function update_data()
                 'acp',
                 'CODEBOX_PLUS_TITLE',
                 array(
-                    'module_basename'   => '\o0johntam0o\codebox_plus\acp\main_module',
+                    'module_basename'   => '\o0johntam0o\codeboxplus\acp\main_module',
                     'modes'             => array('config_codebox_plus'),
                 ),
             )),
diff --git a/ext/o0johntam0o/codebox_plus/styles/prosilver/template/codebox_plus.html b/ext/o0johntam0o/codeboxplus/styles/prosilver/template/codebox_plus.html
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/styles/prosilver/template/codebox_plus.html
rename to ext/o0johntam0o/codeboxplus/styles/prosilver/template/codebox_plus.html
diff --git a/ext/o0johntam0o/codebox_plus/styles/prosilver/template/event/overall_header_head_append.html b/ext/o0johntam0o/codeboxplus/styles/prosilver/template/event/overall_header_head_append.html
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/styles/prosilver/template/event/overall_header_head_append.html
rename to ext/o0johntam0o/codeboxplus/styles/prosilver/template/event/overall_header_head_append.html
diff --git a/ext/o0johntam0o/codebox_plus/styles/prosilver/template/event/posting_editor_buttons_after.html b/ext/o0johntam0o/codeboxplus/styles/prosilver/template/event/posting_editor_buttons_after.html
similarity index 100%
rename from ext/o0johntam0o/codebox_plus/styles/prosilver/template/event/posting_editor_buttons_after.html
rename to ext/o0johntam0o/codeboxplus/styles/prosilver/template/event/posting_editor_buttons_after.html