diff --git a/__unported__/base_external_dbsource/__init__.py b/base_external_dbsource/__init__.py
similarity index 100%
rename from __unported__/base_external_dbsource/__init__.py
rename to base_external_dbsource/__init__.py
diff --git a/__unported__/base_external_dbsource/__openerp__.py b/base_external_dbsource/__openerp__.py
similarity index 100%
rename from __unported__/base_external_dbsource/__openerp__.py
rename to base_external_dbsource/__openerp__.py
diff --git a/__unported__/base_external_dbsource/base_external_dbsource.py b/base_external_dbsource/base_external_dbsource.py
similarity index 100%
rename from __unported__/base_external_dbsource/base_external_dbsource.py
rename to base_external_dbsource/base_external_dbsource.py
diff --git a/__unported__/base_external_dbsource/base_external_dbsource_demo.xml b/base_external_dbsource/base_external_dbsource_demo.xml
similarity index 100%
rename from __unported__/base_external_dbsource/base_external_dbsource_demo.xml
rename to base_external_dbsource/base_external_dbsource_demo.xml
diff --git a/__unported__/base_external_dbsource/base_external_dbsource_view.xml b/base_external_dbsource/base_external_dbsource_view.xml
similarity index 68%
rename from __unported__/base_external_dbsource/base_external_dbsource_view.xml
rename to base_external_dbsource/base_external_dbsource_view.xml
index df6ad85f8..ad694555e 100644
--- a/__unported__/base_external_dbsource/base_external_dbsource_view.xml
+++ b/base_external_dbsource/base_external_dbsource_view.xml
@@ -20,17 +20,23 @@
         <record model="ir.ui.view" id="view_dbsource_form">
             <field name="name">base.external.dbsource.form</field>
             <field name="model">base.external.dbsource</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
-                <form string="External DB Source">
-                    <field name="name"/>
-                    <field name="password" password="True"/>
-                    <newline/>
-		    <field name="connector" colspan="2"/>
-                    <newline/>
-		    <field name="conn_string" colspan="4"/>
-                    <newline/>
-                    <button name="connection_test" string="Test Connection" type="object" icon="gtk-network" colspan="4"/>
+                <form string="External DB Source" version="7.0">
+                <sheet>
+                    <group>
+                        <group>
+                        <field name="name"/>
+                        </group>
+                        <group>
+                        <field name="password" password="True"/>
+                        </group>
+                    </group>
+                    <group col="1">
+		                <field name="connector"/>
+		                <field name="conn_string"/>
+                        <button name="connection_test" string="Test Connection" type="object" icon="gtk-network"/>
+                    </group>
+                </sheet>
                 </form>
             </field>
         </record>
diff --git a/__unported__/base_external_dbsource/images/screenshot01.png b/base_external_dbsource/images/screenshot01.png
similarity index 100%
rename from __unported__/base_external_dbsource/images/screenshot01.png
rename to base_external_dbsource/images/screenshot01.png
diff --git a/__unported__/base_external_dbsource/security/ir.model.access.csv b/base_external_dbsource/security/ir.model.access.csv
similarity index 100%
rename from __unported__/base_external_dbsource/security/ir.model.access.csv
rename to base_external_dbsource/security/ir.model.access.csv
diff --git a/__unported__/base_external_dbsource/test/dbsource_connect.yml b/base_external_dbsource/test/dbsource_connect.yml
similarity index 100%
rename from __unported__/base_external_dbsource/test/dbsource_connect.yml
rename to base_external_dbsource/test/dbsource_connect.yml
diff --git a/__unported__/import_odbc/__init__.py b/import_odbc/__init__.py
similarity index 100%
rename from __unported__/import_odbc/__init__.py
rename to import_odbc/__init__.py
diff --git a/__unported__/import_odbc/__openerp__.py b/import_odbc/__openerp__.py
similarity index 100%
rename from __unported__/import_odbc/__openerp__.py
rename to import_odbc/__openerp__.py
diff --git a/__unported__/import_odbc/images/snapshot1.png b/import_odbc/images/snapshot1.png
similarity index 100%
rename from __unported__/import_odbc/images/snapshot1.png
rename to import_odbc/images/snapshot1.png
diff --git a/__unported__/import_odbc/images/snapshot2.png b/import_odbc/images/snapshot2.png
similarity index 100%
rename from __unported__/import_odbc/images/snapshot2.png
rename to import_odbc/images/snapshot2.png
diff --git a/__unported__/import_odbc/import_odbc.py b/import_odbc/import_odbc.py
similarity index 100%
rename from __unported__/import_odbc/import_odbc.py
rename to import_odbc/import_odbc.py
diff --git a/__unported__/import_odbc/import_odbc_demo.xml b/import_odbc/import_odbc_demo.xml
similarity index 100%
rename from __unported__/import_odbc/import_odbc_demo.xml
rename to import_odbc/import_odbc_demo.xml
diff --git a/__unported__/import_odbc/import_odbc_view.xml b/import_odbc/import_odbc_view.xml
similarity index 61%
rename from __unported__/import_odbc/import_odbc_view.xml
rename to import_odbc/import_odbc_view.xml
index ac754303c..71553ab98 100644
--- a/__unported__/import_odbc/import_odbc_view.xml
+++ b/import_odbc/import_odbc_view.xml
@@ -7,31 +7,42 @@
         <record model="ir.ui.view" id="view_import_dbtable_form">
             <field name="name">import.odbc.dbtable.form</field>
             <field name="model">import.odbc.dbtable</field>
-            <field name="type">form</field>
             <field name="arch" type="xml">
 	        <form string="Table">
-	            <field name="name" search="1"/>
-	            <field name="exec_order"/>
-	            <field name="model_target"/>
-	            <field name="dbsource_id" search="1"/>
-	            <field name="noupdate"/>
-	            <field name="enabled"/>
-	            <field name="ignore_rel_errors"/>
-	            <field name="raise_import_errors"/>
-                    <field name="last_sync"/>
-                    <group colspan="2">
+	            <group>
+	                <group>
+	                    <field name="name" search="1"/>
+	                    <field name="model_target"/>	            
+	                    <field name="noupdate"/>	            
+	                    <field name="ignore_rel_errors"/>
+                        <field name="last_sync"/>
                         <button name="import_run" string="Run Import" type="object" icon="gtk-execute"/>
+                    </group>
+                    <group>                        
+                        <field name="exec_order"/>
+                        <field name="dbsource_id" search="1"/>
+                        <field name="enabled"/>
+                        <field name="raise_import_errors"/>
                         <button name="import_schedule" string="Schedule Import" type="object" icon="gtk-paste"/>
+                    </group> 
+                </group>
+                <group>              
+	                <field name="sql_source" colspan="4"/>
+	            </group>
+                <separator string="Last execution" colspan="4"/>
+                <group>
+                    <group> 
+                        <field name="last_record_count"/>                    
+                        <field name="last_warn_count"/>	            
+                        <field name="last_error_count"/>
+                    </group>
+                    <group>                                     
+                        <field name="start_run"/>
+                        <field name="last_run"/>
+                        <field name="last_log" colspan="4"/>
                     </group>
-	            <field name="sql_source" colspan="4"/>
-                    <separator string="Last execution" colspan="4"/>
-                    <field name="last_record_count"/>
-                    <field name="start_run"/>
-                    <field name="last_warn_count"/>
-	            <field name="last_run"/>
-                    <field name="last_error_count"/>
-                    <field name="last_log" colspan="4"/>
-                </form>
+                </group>
+            </form>
             </field>
         </record>
 
diff --git a/__unported__/import_odbc/security/ir.model.access.csv b/import_odbc/security/ir.model.access.csv
similarity index 100%
rename from __unported__/import_odbc/security/ir.model.access.csv
rename to import_odbc/security/ir.model.access.csv