diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..dfca03d
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,13 @@
+{
+  "name":"sandfox/import_export_fix",
+  "type":"magento-module",
+  "description":"This module solves couple of ImportExport core bugs.",
+  "require":{
+    "magento-hackathon/magento-composer-installer":"*"
+  },
+  "extra":{
+    "map": [
+      ["src/app/", "app/"]
+    ]
+  }
+}
\ No newline at end of file
diff --git a/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php
similarity index 100%
rename from app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php
rename to src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Customer.php
diff --git a/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php
similarity index 98%
rename from app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php
rename to src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php
index d9b996e..e33af30 100644
--- a/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php
+++ b/src/app/code/community/Sandfox/ImportExportFix/Model/Import/Entity/Product.php
@@ -10,7 +10,7 @@
  * @license    http://opensource.org/licenses/MIT  The MIT License
  */
  
-class Sandfox_ImportExportFix_Model_Import_Entity_Product extends Enterprise_ImportExport_Model_Import_Entity_Product
+class Sandfox_ImportExportFix_Model_Import_Entity_Product extends Mage_ImportExport_Model_Import_Entity_Product
 {
     /**
      * Code of a primary attribute which identifies the entity group if import contains of multiple rows
diff --git a/app/code/community/Sandfox/ImportExportFix/etc/config.xml b/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml
similarity index 89%
rename from app/code/community/Sandfox/ImportExportFix/etc/config.xml
rename to src/app/code/community/Sandfox/ImportExportFix/etc/config.xml
index 6342a7e..c68bff9 100644
--- a/app/code/community/Sandfox/ImportExportFix/etc/config.xml
+++ b/src/app/code/community/Sandfox/ImportExportFix/etc/config.xml
@@ -22,13 +22,9 @@
             <sandfox_importexportfix>
                 <class>Sandfox_ImportExportFix_Model</class>
             </sandfox_importexportfix>
-            <enterprise_importexport>
-                <rewrite>
-                    <import_entity_product>Sandfox_ImportExportFix_Model_Import_Entity_Product</import_entity_product>
-                </rewrite>
-            </enterprise_importexport>
             <importexport>
                 <rewrite>
+                    <import_entity_product>Sandfox_ImportExportFix_Model_Import_Entity_Product</import_entity_product>
                     <import_entity_customer>Sandfox_ImportExportFix_Model_Import_Entity_Customer</import_entity_customer>
                 </rewrite>
             </importexport>
diff --git a/app/etc/modules/Sandfox_ImportExportFix.xml b/src/app/etc/modules/Sandfox_ImportExportFix.xml
similarity index 93%
rename from app/etc/modules/Sandfox_ImportExportFix.xml
rename to src/app/etc/modules/Sandfox_ImportExportFix.xml
index 6814924..a029056 100644
--- a/app/etc/modules/Sandfox_ImportExportFix.xml
+++ b/src/app/etc/modules/Sandfox_ImportExportFix.xml
@@ -17,7 +17,7 @@
             <active>true</active>
             <codePool>community</codePool>
             <depends>
-                <Enterprise_ImportExport/>
+                <Mage_ImportExport/>
             </depends>
         </Sandfox_ImportExportFix>
     </modules>