Fixed some namespace bugs

 <?php
+
+use Tz\WordPress\Tools\ShortCodes;
+use Tz\WordPress\Tools;
+
 //error_reporting(E_ALL);
 
 /*
@@ -27,8 +31,8 @@ class HybridGallery {
         $role = get_role('administrator');
         $role->add_cap(self::CAPABILITY);
         
-        self::$widget_dir = TzTools::tools_url('./', __FILE__);
-        self::$upload_dir = dirname(__FILE__).'/uploads/';
+        self::$widget_dir = Tools\url('./', __FILE__);
+        self::$upload_dir = __DIR__.'/uploads/';
         
         require('inc/config.php');
         self::$defaults = $config;
@@ -39,10 +43,10 @@ class HybridGallery {
             $mArr[$option] = $items[0];
         }
         
-        self::$WP_Settings = new WP_Option(self::SETTINGS_NS, $mArr);
+        self::$WP_Settings = new \WP_Option(self::SETTINGS_NS, $mArr);
                         
-        ShortCodes::registerClass('HybridGallery_ShortCodes');
-        add_actions('HybridGallery_Actions');
+        ShortCodes\registerClass('HybridGallery_ShortCodes');
+        Tools\add_actions('HybridGallery_Actions');
     }
     
     public static function adminDisplay() {
@@ -97,8 +101,8 @@ class HybridGallery_Actions {
     public static function wp_print_scripts() {
         wp_enqueue_script('jquery');
         wp_enqueue_script('jquery-form');
-        _enqueue_script('swfobject', TzTools::tools_url('assets/uploadify/swfobject.js', __FILE__), array('jquery'));
-        _enqueue_script('jquery-uploadify', TzTools::tools_url('assets/uploadify/jquery.uploadify.v2.1.0.js', __FILE__), array('jquery','swfobject'));
+        _enqueue_script('swfobject', Tools\url('assets/uploadify/swfobject.js', __FILE__), array('jquery'));
+        _enqueue_script('jquery-uploadify', Tools\url('assets/uploadify/jquery.uploadify.v2.1.0.js', __FILE__), array('jquery','swfobject'));
     }
 
 }
@@ -109,7 +113,7 @@ class HybridGallery_ShortCodes {
     
     public static function HybridGallery($args = array(), $content, $tag) {
     
-        $WP_Settings = new WP_Option(HybridGallery::SETTINGS_NS);
+        $WP_Settings = new \WP_Option(HybridGallery::SETTINGS_NS);
         
         foreach (HybridGallery::$defaults as $key => $val) {
             if (isset($WP_Settings[$key])) {

@@ -4,6 +4,8 @@ namespace Tz\WordPress\Tools\ShortCodes;
 
 use Tz\WordPress\Tools;
 
+use WP_Option;
+
 use \ReflectionClass, \ReflectionMethod, \ReflectionFunction;
 use \Exception;
 
@@ -31,7 +33,7 @@ function add_shortcodes($class) {
 }
 
 function registerClass($class) {
-    call_user_func('add_shortcodes', $class);
+    call_user_func(__NAMESPACE__ . '\add_shortcodes', $class);
 }
 
 function add($code, $callback) {