diff --git a/__unported__/account_credit_control/__init__.py b/account_credit_control/__init__.py
similarity index 100%
rename from __unported__/account_credit_control/__init__.py
rename to account_credit_control/__init__.py
diff --git a/__unported__/account_credit_control/__openerp__.py b/account_credit_control/__openerp__.py
similarity index 100%
rename from __unported__/account_credit_control/__openerp__.py
rename to account_credit_control/__openerp__.py
diff --git a/__unported__/account_credit_control/account.py b/account_credit_control/account.py
similarity index 100%
rename from __unported__/account_credit_control/account.py
rename to account_credit_control/account.py
diff --git a/__unported__/account_credit_control/account_view.xml b/account_credit_control/account_view.xml
similarity index 100%
rename from __unported__/account_credit_control/account_view.xml
rename to account_credit_control/account_view.xml
diff --git a/__unported__/account_credit_control/company.py b/account_credit_control/company.py
similarity index 100%
rename from __unported__/account_credit_control/company.py
rename to account_credit_control/company.py
diff --git a/__unported__/account_credit_control/company_view.xml b/account_credit_control/company_view.xml
similarity index 100%
rename from __unported__/account_credit_control/company_view.xml
rename to account_credit_control/company_view.xml
diff --git a/__unported__/account_credit_control/credit_control_demo.xml b/account_credit_control/credit_control_demo.xml
similarity index 100%
rename from __unported__/account_credit_control/credit_control_demo.xml
rename to account_credit_control/credit_control_demo.xml
diff --git a/__unported__/account_credit_control/data.xml b/account_credit_control/data.xml
similarity index 100%
rename from __unported__/account_credit_control/data.xml
rename to account_credit_control/data.xml
diff --git a/__unported__/account_credit_control/i18n/de.po b/account_credit_control/i18n/de.po
similarity index 100%
rename from __unported__/account_credit_control/i18n/de.po
rename to account_credit_control/i18n/de.po
diff --git a/__unported__/account_credit_control/i18n/en.po b/account_credit_control/i18n/en.po
similarity index 100%
rename from __unported__/account_credit_control/i18n/en.po
rename to account_credit_control/i18n/en.po
diff --git a/__unported__/account_credit_control/i18n/es.po b/account_credit_control/i18n/es.po
similarity index 100%
rename from __unported__/account_credit_control/i18n/es.po
rename to account_credit_control/i18n/es.po
diff --git a/__unported__/account_credit_control/i18n/fr.po b/account_credit_control/i18n/fr.po
similarity index 100%
rename from __unported__/account_credit_control/i18n/fr.po
rename to account_credit_control/i18n/fr.po
diff --git a/__unported__/account_credit_control/invoice.py b/account_credit_control/invoice.py
similarity index 100%
rename from __unported__/account_credit_control/invoice.py
rename to account_credit_control/invoice.py
diff --git a/__unported__/account_credit_control/line.py b/account_credit_control/line.py
similarity index 100%
rename from __unported__/account_credit_control/line.py
rename to account_credit_control/line.py
diff --git a/__unported__/account_credit_control/line_view.xml b/account_credit_control/line_view.xml
similarity index 100%
rename from __unported__/account_credit_control/line_view.xml
rename to account_credit_control/line_view.xml
diff --git a/__unported__/account_credit_control/mail.py b/account_credit_control/mail.py
similarity index 100%
rename from __unported__/account_credit_control/mail.py
rename to account_credit_control/mail.py
diff --git a/__unported__/account_credit_control/partner.py b/account_credit_control/partner.py
similarity index 100%
rename from __unported__/account_credit_control/partner.py
rename to account_credit_control/partner.py
diff --git a/__unported__/account_credit_control/partner_view.xml b/account_credit_control/partner_view.xml
similarity index 100%
rename from __unported__/account_credit_control/partner_view.xml
rename to account_credit_control/partner_view.xml
diff --git a/__unported__/account_credit_control/policy.py b/account_credit_control/policy.py
similarity index 100%
rename from __unported__/account_credit_control/policy.py
rename to account_credit_control/policy.py
diff --git a/__unported__/account_credit_control/policy_view.xml b/account_credit_control/policy_view.xml
similarity index 100%
rename from __unported__/account_credit_control/policy_view.xml
rename to account_credit_control/policy_view.xml
diff --git a/__unported__/account_credit_control/report/__init__.py b/account_credit_control/report/__init__.py
similarity index 100%
rename from __unported__/account_credit_control/report/__init__.py
rename to account_credit_control/report/__init__.py
diff --git a/__unported__/account_credit_control/report/credit_control_summary.html.mako b/account_credit_control/report/credit_control_summary.html.mako
similarity index 100%
rename from __unported__/account_credit_control/report/credit_control_summary.html.mako
rename to account_credit_control/report/credit_control_summary.html.mako
diff --git a/__unported__/account_credit_control/report/credit_control_summary.py b/account_credit_control/report/credit_control_summary.py
similarity index 100%
rename from __unported__/account_credit_control/report/credit_control_summary.py
rename to account_credit_control/report/credit_control_summary.py
diff --git a/__unported__/account_credit_control/report/report.xml b/account_credit_control/report/report.xml
similarity index 100%
rename from __unported__/account_credit_control/report/report.xml
rename to account_credit_control/report/report.xml
diff --git a/__unported__/account_credit_control/run.py b/account_credit_control/run.py
similarity index 100%
rename from __unported__/account_credit_control/run.py
rename to account_credit_control/run.py
diff --git a/__unported__/account_credit_control/run_view.xml b/account_credit_control/run_view.xml
similarity index 100%
rename from __unported__/account_credit_control/run_view.xml
rename to account_credit_control/run_view.xml
diff --git a/__unported__/account_credit_control/scenarios/features/00_credit_control_param.feature b/account_credit_control/scenarios/features/00_credit_control_param.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/00_credit_control_param.feature
rename to account_credit_control/scenarios/features/00_credit_control_param.feature
diff --git a/__unported__/account_credit_control/scenarios/features/01_credit_control_partners.feature b/account_credit_control/scenarios/features/01_credit_control_partners.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/01_credit_control_partners.feature
rename to account_credit_control/scenarios/features/01_credit_control_partners.feature
diff --git a/__unported__/account_credit_control/scenarios/features/02_credit_control_invoices.feature b/account_credit_control/scenarios/features/02_credit_control_invoices.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/02_credit_control_invoices.feature
rename to account_credit_control/scenarios/features/02_credit_control_invoices.feature
diff --git a/__unported__/account_credit_control/scenarios/features/03_credit_control_run_jan.feature b/account_credit_control/scenarios/features/03_credit_control_run_jan.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/03_credit_control_run_jan.feature
rename to account_credit_control/scenarios/features/03_credit_control_run_jan.feature
diff --git a/__unported__/account_credit_control/scenarios/features/04_credit_control_run_feb.feature b/account_credit_control/scenarios/features/04_credit_control_run_feb.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/04_credit_control_run_feb.feature
rename to account_credit_control/scenarios/features/04_credit_control_run_feb.feature
diff --git a/__unported__/account_credit_control/scenarios/features/05_credit_control_run_mar.feature b/account_credit_control/scenarios/features/05_credit_control_run_mar.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/05_credit_control_run_mar.feature
rename to account_credit_control/scenarios/features/05_credit_control_run_mar.feature
diff --git a/__unported__/account_credit_control/scenarios/features/06_credit_control_run_apr.feature b/account_credit_control/scenarios/features/06_credit_control_run_apr.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/06_credit_control_run_apr.feature
rename to account_credit_control/scenarios/features/06_credit_control_run_apr.feature
diff --git a/__unported__/account_credit_control/scenarios/features/07_credit_control_run_may.feature b/account_credit_control/scenarios/features/07_credit_control_run_may.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/07_credit_control_run_may.feature
rename to account_credit_control/scenarios/features/07_credit_control_run_may.feature
diff --git a/__unported__/account_credit_control/scenarios/features/08_credit_control_run_jun.feature b/account_credit_control/scenarios/features/08_credit_control_run_jun.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/08_credit_control_run_jun.feature
rename to account_credit_control/scenarios/features/08_credit_control_run_jun.feature
diff --git a/__unported__/account_credit_control/scenarios/features/09_credit_control_run_jul.feature b/account_credit_control/scenarios/features/09_credit_control_run_jul.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/09_credit_control_run_jul.feature
rename to account_credit_control/scenarios/features/09_credit_control_run_jul.feature
diff --git a/__unported__/account_credit_control/scenarios/features/10_credit_control_run_aug.feature b/account_credit_control/scenarios/features/10_credit_control_run_aug.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/10_credit_control_run_aug.feature
rename to account_credit_control/scenarios/features/10_credit_control_run_aug.feature
diff --git a/__unported__/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature b/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
rename to account_credit_control/scenarios/features/11_credit_control_manual_setting.feature
diff --git a/__unported__/account_credit_control/scenarios/features/steps/account_credit_control.py b/account_credit_control/scenarios/features/steps/account_credit_control.py
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/steps/account_credit_control.py
rename to account_credit_control/scenarios/features/steps/account_credit_control.py
diff --git a/__unported__/account_credit_control/scenarios/features/steps/account_credit_control_changer.py b/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/steps/account_credit_control_changer.py
rename to account_credit_control/scenarios/features/steps/account_credit_control_changer.py
diff --git a/__unported__/account_credit_control/scenarios/features/steps/account_voucher.py b/account_credit_control/scenarios/features/steps/account_voucher.py
similarity index 100%
rename from __unported__/account_credit_control/scenarios/features/steps/account_voucher.py
rename to account_credit_control/scenarios/features/steps/account_voucher.py
diff --git a/__unported__/account_credit_control/security/ir.model.access.csv b/account_credit_control/security/ir.model.access.csv
similarity index 100%
rename from __unported__/account_credit_control/security/ir.model.access.csv
rename to account_credit_control/security/ir.model.access.csv
diff --git a/__unported__/account_credit_control/wizard/__init__.py b/account_credit_control/wizard/__init__.py
similarity index 100%
rename from __unported__/account_credit_control/wizard/__init__.py
rename to account_credit_control/wizard/__init__.py
diff --git a/__unported__/account_credit_control/wizard/credit_control_communication.py b/account_credit_control/wizard/credit_control_communication.py
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_communication.py
rename to account_credit_control/wizard/credit_control_communication.py
diff --git a/__unported__/account_credit_control/wizard/credit_control_emailer.py b/account_credit_control/wizard/credit_control_emailer.py
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_emailer.py
rename to account_credit_control/wizard/credit_control_emailer.py
diff --git a/__unported__/account_credit_control/wizard/credit_control_emailer_view.xml b/account_credit_control/wizard/credit_control_emailer_view.xml
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_emailer_view.xml
rename to account_credit_control/wizard/credit_control_emailer_view.xml
diff --git a/__unported__/account_credit_control/wizard/credit_control_marker.py b/account_credit_control/wizard/credit_control_marker.py
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_marker.py
rename to account_credit_control/wizard/credit_control_marker.py
diff --git a/__unported__/account_credit_control/wizard/credit_control_marker_view.xml b/account_credit_control/wizard/credit_control_marker_view.xml
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_marker_view.xml
rename to account_credit_control/wizard/credit_control_marker_view.xml
diff --git a/__unported__/account_credit_control/wizard/credit_control_policy_changer.py b/account_credit_control/wizard/credit_control_policy_changer.py
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_policy_changer.py
rename to account_credit_control/wizard/credit_control_policy_changer.py
diff --git a/__unported__/account_credit_control/wizard/credit_control_policy_changer_view.xml b/account_credit_control/wizard/credit_control_policy_changer_view.xml
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_policy_changer_view.xml
rename to account_credit_control/wizard/credit_control_policy_changer_view.xml
diff --git a/__unported__/account_credit_control/wizard/credit_control_printer.py b/account_credit_control/wizard/credit_control_printer.py
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_printer.py
rename to account_credit_control/wizard/credit_control_printer.py
diff --git a/__unported__/account_credit_control/wizard/credit_control_printer_view.xml b/account_credit_control/wizard/credit_control_printer_view.xml
similarity index 100%
rename from __unported__/account_credit_control/wizard/credit_control_printer_view.xml
rename to account_credit_control/wizard/credit_control_printer_view.xml