diff --git a/README.md b/README.md
index 8282bd8c..477e29f2 100644
--- a/README.md
+++ b/README.md
@@ -52,11 +52,11 @@ Unported addons
 ---------------
 addon | version | summary
 --- | --- | ---
-[crm_claim_categ_as_name](__unported__/crm_claim_categ_as_name/) | 1.0 (unported) | crm_claim_categ_as_name
-[crm_claim_ext](__unported__/crm_claim_ext/) | 1.0 (unported) | CRM claim extension
-[crm_rma_advance_location](__unported__/crm_rma_advance_location/) | 1.0 (unported) | RMA Claims Advance Location
-[crm_rma_by_shop](__unported__/crm_rma_by_shop/) | 1.0 (unported) | RMA Claims by shop
-[crm_rma_lot_mass_return](__unported__/crm_rma_lot_mass_return/) | 1.0 (unported) | RMA Claims Mass Return by Lot
-[crm_rma_stock_location](__unported__/crm_rma_stock_location/) | 1.0 (unported) | RMA Stock Location
+[crm_claim_categ_as_name](crm_claim_categ_as_name/) | 1.0 (unported) | crm_claim_categ_as_name
+[crm_claim_ext](crm_claim_ext/) | 1.0 (unported) | CRM claim extension
+[crm_rma_advance_location](crm_rma_advance_location/) | 1.0 (unported) | RMA Claims Advance Location
+[crm_rma_by_shop](crm_rma_by_shop/) | 1.0 (unported) | RMA Claims by shop
+[crm_rma_lot_mass_return](crm_rma_lot_mass_return/) | 1.0 (unported) | RMA Claims Mass Return by Lot
+[crm_rma_stock_location](crm_rma_stock_location/) | 1.0 (unported) | RMA Stock Location
 
 [//]: # (end addons)
diff --git a/__unported__/crm_claim_categ_as_name/__init__.py b/crm_claim_categ_as_name/__init__.py
similarity index 100%
rename from __unported__/crm_claim_categ_as_name/__init__.py
rename to crm_claim_categ_as_name/__init__.py
diff --git a/__unported__/crm_claim_categ_as_name/__openerp__.py b/crm_claim_categ_as_name/__openerp__.py
similarity index 100%
rename from __unported__/crm_claim_categ_as_name/__openerp__.py
rename to crm_claim_categ_as_name/__openerp__.py
diff --git a/__unported__/crm_claim_categ_as_name/claim.py b/crm_claim_categ_as_name/claim.py
similarity index 100%
rename from __unported__/crm_claim_categ_as_name/claim.py
rename to crm_claim_categ_as_name/claim.py
diff --git a/__unported__/crm_claim_categ_as_name/claim_view.xml b/crm_claim_categ_as_name/claim_view.xml
similarity index 100%
rename from __unported__/crm_claim_categ_as_name/claim_view.xml
rename to crm_claim_categ_as_name/claim_view.xml
diff --git a/__unported__/crm_claim_ext/__init__.py b/crm_claim_ext/__init__.py
similarity index 100%
rename from __unported__/crm_claim_ext/__init__.py
rename to crm_claim_ext/__init__.py
diff --git a/__unported__/crm_claim_ext/__openerp__.py b/crm_claim_ext/__openerp__.py
similarity index 100%
rename from __unported__/crm_claim_ext/__openerp__.py
rename to crm_claim_ext/__openerp__.py
diff --git a/__unported__/crm_claim_ext/crm_claim_ext.py b/crm_claim_ext/crm_claim_ext.py
similarity index 100%
rename from __unported__/crm_claim_ext/crm_claim_ext.py
rename to crm_claim_ext/crm_claim_ext.py
diff --git a/__unported__/crm_claim_ext/crm_claim_ext_view.xml b/crm_claim_ext/crm_claim_ext_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/crm_claim_ext_view.xml
rename to crm_claim_ext/crm_claim_ext_view.xml
diff --git a/__unported__/crm_claim_ext/wizard/__init__.py b/crm_claim_ext/wizard/__init__.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/__init__.py
rename to crm_claim_ext/wizard/__init__.py
diff --git a/__unported__/crm_claim_ext/wizard/exchange_from_returned_lines.py b/crm_claim_ext/wizard/exchange_from_returned_lines.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/exchange_from_returned_lines.py
rename to crm_claim_ext/wizard/exchange_from_returned_lines.py
diff --git a/__unported__/crm_claim_ext/wizard/exchange_from_returned_lines_wizard_view.xml b/crm_claim_ext/wizard/exchange_from_returned_lines_wizard_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/exchange_from_returned_lines_wizard_view.xml
rename to crm_claim_ext/wizard/exchange_from_returned_lines_wizard_view.xml
diff --git a/__unported__/crm_claim_ext/wizard/get_empty_serial.py b/crm_claim_ext/wizard/get_empty_serial.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/get_empty_serial.py
rename to crm_claim_ext/wizard/get_empty_serial.py
diff --git a/__unported__/crm_claim_ext/wizard/get_empty_serial_view.xml b/crm_claim_ext/wizard/get_empty_serial_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/get_empty_serial_view.xml
rename to crm_claim_ext/wizard/get_empty_serial_view.xml
diff --git a/__unported__/crm_claim_ext/wizard/picking_from_exchange_lines.py b/crm_claim_ext/wizard/picking_from_exchange_lines.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/picking_from_exchange_lines.py
rename to crm_claim_ext/wizard/picking_from_exchange_lines.py
diff --git a/__unported__/crm_claim_ext/wizard/picking_from_exchange_lines_wizard_view.xml b/crm_claim_ext/wizard/picking_from_exchange_lines_wizard_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/picking_from_exchange_lines_wizard_view.xml
rename to crm_claim_ext/wizard/picking_from_exchange_lines_wizard_view.xml
diff --git a/__unported__/crm_claim_ext/wizard/picking_from_returned_lines.py b/crm_claim_ext/wizard/picking_from_returned_lines.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/picking_from_returned_lines.py
rename to crm_claim_ext/wizard/picking_from_returned_lines.py
diff --git a/__unported__/crm_claim_ext/wizard/picking_from_returned_lines_wizard_view.xml b/crm_claim_ext/wizard/picking_from_returned_lines_wizard_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/picking_from_returned_lines_wizard_view.xml
rename to crm_claim_ext/wizard/picking_from_returned_lines_wizard_view.xml
diff --git a/__unported__/crm_claim_ext/wizard/refund_from_returned_lines.py b/crm_claim_ext/wizard/refund_from_returned_lines.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/refund_from_returned_lines.py
rename to crm_claim_ext/wizard/refund_from_returned_lines.py
diff --git a/__unported__/crm_claim_ext/wizard/refund_from_returned_lines_wizard_view.xml b/crm_claim_ext/wizard/refund_from_returned_lines_wizard_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/refund_from_returned_lines_wizard_view.xml
rename to crm_claim_ext/wizard/refund_from_returned_lines_wizard_view.xml
diff --git a/__unported__/crm_claim_ext/wizard/returned_lines_from_invoice.py b/crm_claim_ext/wizard/returned_lines_from_invoice.py
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/returned_lines_from_invoice.py
rename to crm_claim_ext/wizard/returned_lines_from_invoice.py
diff --git a/__unported__/crm_claim_ext/wizard/returned_lines_from_invoice_wizard_view.xml b/crm_claim_ext/wizard/returned_lines_from_invoice_wizard_view.xml
similarity index 100%
rename from __unported__/crm_claim_ext/wizard/returned_lines_from_invoice_wizard_view.xml
rename to crm_claim_ext/wizard/returned_lines_from_invoice_wizard_view.xml
diff --git a/__unported__/crm_rma_advance_location/__init__.py b/crm_rma_advance_location/__init__.py
similarity index 100%
rename from __unported__/crm_rma_advance_location/__init__.py
rename to crm_rma_advance_location/__init__.py
diff --git a/__unported__/crm_rma_advance_location/__openerp__.py b/crm_rma_advance_location/__openerp__.py
similarity index 100%
rename from __unported__/crm_rma_advance_location/__openerp__.py
rename to crm_rma_advance_location/__openerp__.py
diff --git a/__unported__/crm_rma_advance_location/claim_rma_view.xml b/crm_rma_advance_location/claim_rma_view.xml
similarity index 100%
rename from __unported__/crm_rma_advance_location/claim_rma_view.xml
rename to crm_rma_advance_location/claim_rma_view.xml
diff --git a/__unported__/crm_rma_advance_location/i18n/crm_rma_advance_location.pot b/crm_rma_advance_location/i18n/crm_rma_advance_location.pot
similarity index 100%
rename from __unported__/crm_rma_advance_location/i18n/crm_rma_advance_location.pot
rename to crm_rma_advance_location/i18n/crm_rma_advance_location.pot
diff --git a/__unported__/crm_rma_advance_location/stock.py b/crm_rma_advance_location/stock.py
similarity index 100%
rename from __unported__/crm_rma_advance_location/stock.py
rename to crm_rma_advance_location/stock.py
diff --git a/__unported__/crm_rma_advance_location/stock_data.xml b/crm_rma_advance_location/stock_data.xml
similarity index 100%
rename from __unported__/crm_rma_advance_location/stock_data.xml
rename to crm_rma_advance_location/stock_data.xml
diff --git a/__unported__/crm_rma_advance_location/stock_view.xml b/crm_rma_advance_location/stock_view.xml
similarity index 100%
rename from __unported__/crm_rma_advance_location/stock_view.xml
rename to crm_rma_advance_location/stock_view.xml
diff --git a/__unported__/crm_rma_advance_location/wizard/__init__.py b/crm_rma_advance_location/wizard/__init__.py
similarity index 100%
rename from __unported__/crm_rma_advance_location/wizard/__init__.py
rename to crm_rma_advance_location/wizard/__init__.py
diff --git a/__unported__/crm_rma_advance_location/wizard/claim_make_picking.py b/crm_rma_advance_location/wizard/claim_make_picking.py
similarity index 100%
rename from __unported__/crm_rma_advance_location/wizard/claim_make_picking.py
rename to crm_rma_advance_location/wizard/claim_make_picking.py
diff --git a/__unported__/crm_rma_advance_location/wizard/claim_make_picking_from_picking.py b/crm_rma_advance_location/wizard/claim_make_picking_from_picking.py
similarity index 100%
rename from __unported__/crm_rma_advance_location/wizard/claim_make_picking_from_picking.py
rename to crm_rma_advance_location/wizard/claim_make_picking_from_picking.py
diff --git a/__unported__/crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml b/crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml
similarity index 100%
rename from __unported__/crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml
rename to crm_rma_advance_location/wizard/claim_make_picking_from_picking_view.xml
diff --git a/__unported__/crm_rma_advance_location/wizard/claim_make_picking_view.xml b/crm_rma_advance_location/wizard/claim_make_picking_view.xml
similarity index 100%
rename from __unported__/crm_rma_advance_location/wizard/claim_make_picking_view.xml
rename to crm_rma_advance_location/wizard/claim_make_picking_view.xml
diff --git a/__unported__/crm_rma_by_shop/__init__.py b/crm_rma_by_shop/__init__.py
similarity index 100%
rename from __unported__/crm_rma_by_shop/__init__.py
rename to crm_rma_by_shop/__init__.py
diff --git a/__unported__/crm_rma_by_shop/__openerp__.py b/crm_rma_by_shop/__openerp__.py
similarity index 100%
rename from __unported__/crm_rma_by_shop/__openerp__.py
rename to crm_rma_by_shop/__openerp__.py
diff --git a/__unported__/crm_rma_by_shop/claim.py b/crm_rma_by_shop/claim.py
similarity index 100%
rename from __unported__/crm_rma_by_shop/claim.py
rename to crm_rma_by_shop/claim.py
diff --git a/__unported__/crm_rma_by_shop/claim_view.xml b/crm_rma_by_shop/claim_view.xml
similarity index 100%
rename from __unported__/crm_rma_by_shop/claim_view.xml
rename to crm_rma_by_shop/claim_view.xml
diff --git a/__unported__/crm_rma_by_shop/i18n/crm_rma_by_shop.pot b/crm_rma_by_shop/i18n/crm_rma_by_shop.pot
similarity index 100%
rename from __unported__/crm_rma_by_shop/i18n/crm_rma_by_shop.pot
rename to crm_rma_by_shop/i18n/crm_rma_by_shop.pot
diff --git a/__unported__/crm_rma_lot_mass_return/__init__.py b/crm_rma_lot_mass_return/__init__.py
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/__init__.py
rename to crm_rma_lot_mass_return/__init__.py
diff --git a/__unported__/crm_rma_lot_mass_return/__openerp__.py b/crm_rma_lot_mass_return/__openerp__.py
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/__openerp__.py
rename to crm_rma_lot_mass_return/__openerp__.py
diff --git a/__unported__/crm_rma_lot_mass_return/crm_rma_view.xml b/crm_rma_lot_mass_return/crm_rma_view.xml
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/crm_rma_view.xml
rename to crm_rma_lot_mass_return/crm_rma_view.xml
diff --git a/__unported__/crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot b/crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot
rename to crm_rma_lot_mass_return/i18n/crm_rma_lot_mass_return.pot
diff --git a/__unported__/crm_rma_lot_mass_return/wizard/__init__.py b/crm_rma_lot_mass_return/wizard/__init__.py
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/wizard/__init__.py
rename to crm_rma_lot_mass_return/wizard/__init__.py
diff --git a/__unported__/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py b/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py
rename to crm_rma_lot_mass_return/wizard/returned_lines_from_serial.py
diff --git a/__unported__/crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml b/crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml
similarity index 100%
rename from __unported__/crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml
rename to crm_rma_lot_mass_return/wizard/returned_lines_from_serial_wizard_view.xml
diff --git a/__unported__/crm_rma_stock_location/__init__.py b/crm_rma_stock_location/__init__.py
similarity index 100%
rename from __unported__/crm_rma_stock_location/__init__.py
rename to crm_rma_stock_location/__init__.py
diff --git a/__unported__/crm_rma_stock_location/__openerp__.py b/crm_rma_stock_location/__openerp__.py
similarity index 100%
rename from __unported__/crm_rma_stock_location/__openerp__.py
rename to crm_rma_stock_location/__openerp__.py
diff --git a/__unported__/crm_rma_stock_location/i18n/crm_rma_stock_location.pot b/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
similarity index 100%
rename from __unported__/crm_rma_stock_location/i18n/crm_rma_stock_location.pot
rename to crm_rma_stock_location/i18n/crm_rma_stock_location.pot
diff --git a/__unported__/crm_rma_stock_location/i18n/fr.po b/crm_rma_stock_location/i18n/fr.po
similarity index 100%
rename from __unported__/crm_rma_stock_location/i18n/fr.po
rename to crm_rma_stock_location/i18n/fr.po
diff --git a/__unported__/crm_rma_stock_location/product.py b/crm_rma_stock_location/product.py
similarity index 100%
rename from __unported__/crm_rma_stock_location/product.py
rename to crm_rma_stock_location/product.py
diff --git a/__unported__/crm_rma_stock_location/product_view.xml b/crm_rma_stock_location/product_view.xml
similarity index 100%
rename from __unported__/crm_rma_stock_location/product_view.xml
rename to crm_rma_stock_location/product_view.xml
diff --git a/__unported__/crm_rma_stock_location/stock_data.xml b/crm_rma_stock_location/stock_data.xml
similarity index 100%
rename from __unported__/crm_rma_stock_location/stock_data.xml
rename to crm_rma_stock_location/stock_data.xml
diff --git a/__unported__/crm_rma_stock_location/stock_warehouse.py b/crm_rma_stock_location/stock_warehouse.py
similarity index 100%
rename from __unported__/crm_rma_stock_location/stock_warehouse.py
rename to crm_rma_stock_location/stock_warehouse.py
diff --git a/__unported__/crm_rma_stock_location/stock_warehouse_view.xml b/crm_rma_stock_location/stock_warehouse_view.xml
similarity index 100%
rename from __unported__/crm_rma_stock_location/stock_warehouse_view.xml
rename to crm_rma_stock_location/stock_warehouse_view.xml
diff --git a/__unported__/crm_rma_stock_location/test/quantity.yml b/crm_rma_stock_location/test/quantity.yml
similarity index 100%
rename from __unported__/crm_rma_stock_location/test/quantity.yml
rename to crm_rma_stock_location/test/quantity.yml