diff --git a/Ordernumber/Helper/Data.php b/app/code/community/OpenTools/Ordernumber/Helper/Data.php
similarity index 100%
rename from Ordernumber/Helper/Data.php
rename to app/code/community/OpenTools/Ordernumber/Helper/Data.php
diff --git a/Ordernumber/Model/Observer.php b/app/code/community/OpenTools/Ordernumber/Model/Observer.php
similarity index 98%
rename from Ordernumber/Model/Observer.php
rename to app/code/community/OpenTools/Ordernumber/Model/Observer.php
index 243853fe06608b13dc9073af6d87fd58f398959c..64377d32bbf1f8dd1b24a5c66812c500c0c19a70 100644
--- a/Ordernumber/Model/Observer.php
+++ b/app/code/community/OpenTools/Ordernumber/Model/Observer.php
@@ -80,7 +80,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
             $digits = Mage::getStoreConfig($cfgprefix.'/digits', $storeId);
 
             // First, replace all variables:
-            $helper = Mage::helper('ordernumber');
+            $helper = Mage::helper('opentools/ordernumber');
             $info = array('order'=>$order, $nrtype=>$object);
             $nr = $helper->replace_fields ($format, $nrtype, $info);
 
@@ -102,7 +102,7 @@ class OpenTools_Ordernumber_Model_Observer extends Mage_Core_Model_Abstract
 
                 // Find the next counter value
                 $count = $model->getCounterValueIncremented($nrtype, $counterfmt);
-                $newnumber = str_replace ("#", sprintf('%0' . (int)$padding . 's', $count), $format);
+                $newnumber = str_replace ("#", sprintf('%0' . (int)$digits . 's', $count), $format);
                 
                 // Check whether that number is already in use. If so, attempt to create the next number:
                 $modelname=($nrtype=='order') ? 'sales/order' : ('sales/order_'.$nrtype);
diff --git a/Ordernumber/Model/Ordernumber.php b/app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
similarity index 100%
rename from Ordernumber/Model/Ordernumber.php
rename to app/code/community/OpenTools/Ordernumber/Model/Ordernumber.php
diff --git a/Ordernumber/Model/Resource/Ordernumber.php b/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
similarity index 100%
rename from Ordernumber/Model/Resource/Ordernumber.php
rename to app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber.php
diff --git a/Ordernumber/Model/Resource/Ordernumber/Collection.php b/app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber/Collection.php
similarity index 100%
rename from Ordernumber/Model/Resource/Ordernumber/Collection.php
rename to app/code/community/OpenTools/Ordernumber/Model/Resource/Ordernumber/Collection.php
diff --git a/Ordernumber/etc/config.xml b/app/code/community/OpenTools/Ordernumber/etc/config.xml
similarity index 99%
rename from Ordernumber/etc/config.xml
rename to app/code/community/OpenTools/Ordernumber/etc/config.xml
index 2030f4ab8c8b2ca2c6fc24ffae062e983c464a4b..9af89a0b4649e766876886b651a476fbd5438c71 100644
--- a/Ordernumber/etc/config.xml
+++ b/app/code/community/OpenTools/Ordernumber/etc/config.xml
@@ -49,6 +49,7 @@
                 </connection>
             </opentools_ordernumber_read>
         </resources>
+        
         <events>
             <sales_model_service_quote_submit_before>
                 <observers>
@@ -97,6 +98,7 @@
             </sales_order_creditmemo_save_before>
         </events>
     </global>
+        
     <adminhtml>
         <acl>
             <resources>
diff --git a/Ordernumber/etc/system.xml b/app/code/community/OpenTools/Ordernumber/etc/system.xml
similarity index 100%
rename from Ordernumber/etc/system.xml
rename to app/code/community/OpenTools/Ordernumber/etc/system.xml
diff --git a/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php b/app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
similarity index 100%
rename from Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
rename to app/code/community/OpenTools/Ordernumber/sql/opentools_ordernumber_setup/install-0.1.0.php
diff --git a/OpenTools_Ordernumber.xml b/app/etc/modules/OpenTools_Ordernumber.xml
similarity index 100%
rename from OpenTools_Ordernumber.xml
rename to app/etc/modules/OpenTools_Ordernumber.xml