diff --git a/__init__.py b/__init__.py
index 0650744..9b42961 100644
--- a/__init__.py
+++ b/__init__.py
@@ -1 +1,2 @@
 from . import models
+from . import wizard
diff --git a/models/__init__.py b/models/__init__.py
index acb416b..f92506b 100644
--- a/models/__init__.py
+++ b/models/__init__.py
@@ -1,8 +1,5 @@
-from . import contract_wizard
 from . import res_partner
 from . import res_partner_contract
 from . import res_partner_contract_field
 from . import res_partner_contract_field_transient
 from . import sale_order
-
-# TODO: rename all fields ilike 'adress' -> 'address'
diff --git a/wizard/__init__.py b/wizard/__init__.py
new file mode 100644
index 0000000..8d7b1b4
--- /dev/null
+++ b/wizard/__init__.py
@@ -0,0 +1 @@
+from . import res_partner_contract_wizard
diff --git a/models/contract_wizard.py b/wizard/res_partner_contract_wizard.py
similarity index 98%
rename from models/contract_wizard.py
rename to wizard/res_partner_contract_wizard.py
index 6892967..224a81a 100644
--- a/models/contract_wizard.py
+++ b/wizard/res_partner_contract_wizard.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 import base64
+import logging
 import math
 from datetime import datetime
 
@@ -9,6 +10,9 @@ from pytils import numeral
 
 from ..utils.docxtpl import get_document_from_values_stream
 
+_logger = logging.getLogger(__name__)
+
+
 class ContractWizard(models.TransientModel):
     _name = 'res.partner.contract.wizard'
 
diff --git a/views/contract_wizard.xml b/wizard/res_partner_contract_wizard.xml
similarity index 59%
rename from views/contract_wizard.xml
rename to wizard/res_partner_contract_wizard.xml
index 5aaf394..bf7daf7 100644
--- a/views/contract_wizard.xml
+++ b/wizard/res_partner_contract_wizard.xml
@@ -1,39 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
 
-    <act_window id="res_partner_contract_wizard_action"
-                name="Contract wizard"
-                res_model="res.partner.contract.wizard"
-                src_model="res.partner.contract"
-                view_mode="form"
-                target="new"/>
+    <act_window id="res_partner_contract_wizard_action" name="Contract wizard" res_model="res.partner.contract.wizard" src_model="res.partner.contract" view_mode="form" target="new"/>
 
-    <report
-                id="contract_company_template"
-                model="res.partner.contract.wizard"
-                string="Contract"
-                report_type="qweb-pdf"
-                name="client_contracts.contract_template"
-                file="client_contracts.contract_template"
-        />
+    <report id="contract_company_template" model="res.partner.contract.wizard" string="Contract" report_type="qweb-pdf" name="client_contracts.contract_template" file="client_contracts.contract_template" />
 
-     <report
-                id="contract_personal_template"
-                model="res.partner.contract.wizard"
-                string="Contract"
-                report_type="qweb-pdf"
-                name="client_contracts.contract_fiz_template"
-                file="client_contracts.contract_fiz_template"
-        />
+    <report id="contract_personal_template" model="res.partner.contract.wizard" string="Contract" report_type="qweb-pdf" name="client_contracts.contract_fiz_template" file="client_contracts.contract_fiz_template" />
 
-    <report
-                id="contract_appex_only_template_print"
-                model="res.partner.contract.wizard"
-                string="Contract"
-                report_type="qweb-pdf"
-                name="client_contracts.contract_appex_only_template"
-                file="client_contracts.contract_appex_only_template"
-        />
+    <report id="contract_appex_only_template_print" model="res.partner.contract.wizard" string="Contract" report_type="qweb-pdf" name="client_contracts.contract_appex_only_template" file="client_contracts.contract_appex_only_template" />
 
     <record id="res_partner_contract_wizard_view" model="ir.ui.view">
         <field name="name">Contract print wizard</field>