diff --git a/addons/account_check_writing/account_voucher.py b/addons/account_check_writing/account_voucher.py
index 93e9acedefe..7a5d12f5cff 100644
--- a/addons/account_check_writing/account_voucher.py
+++ b/addons/account_check_writing/account_voucher.py
@@ -21,7 +21,7 @@
 
 from openerp.osv import osv,fields
 from openerp.tools.translate import _
-from tools.amount_to_text_en import amount_to_text
+from openerp.tools.amount_to_text_en import amount_to_text
 from lxml import etree
 
 class account_voucher(osv.osv):
diff --git a/addons/account_check_writing/wizard/account_check_batch_printing.py b/addons/account_check_writing/wizard/account_check_batch_printing.py
index 76489dee901..afeb5de6445 100644
--- a/addons/account_check_writing/wizard/account_check_batch_printing.py
+++ b/addons/account_check_writing/wizard/account_check_batch_printing.py
@@ -19,9 +19,9 @@
 #
 ##############################################################################
 
-from tools.translate import _
+from openerp.tools.translate import _
 
-from osv import fields, osv
+from openerp.osv import fields, osv
 
 class account_check_write(osv.osv_memory):
     _name = 'account.check.write'
diff --git a/addons/account_test/account_test.py b/addons/account_test/account_test.py
index bf925e8236a..7cea7b3afd6 100644
--- a/addons/account_test/account_test.py
+++ b/addons/account_test/account_test.py
@@ -28,7 +28,7 @@
 #
 ##############################################################################
 
-from osv import fields,osv
+from openerp.osv import fields,osv
 import pooler
 import netsvc
 import time
diff --git a/addons/account_test/report/account_test_report.py b/addons/account_test/report/account_test_report.py
index ab683e18688..abf0385be86 100644
--- a/addons/account_test/report/account_test_report.py
+++ b/addons/account_test/report/account_test_report.py
@@ -23,7 +23,7 @@
 import datetime
 import time
 from report import report_sxw
-from tools.translate import _
+from openerp.tools.translate import _
 #
 # Use period and Journal for selection or resources
 #
diff --git a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
index 4b2c3324a04..93e8cc058a3 100644
--- a/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
+++ b/addons/analytic_contract_hr_expense/analytic_contract_hr_expense.py
@@ -18,13 +18,9 @@
 #    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 ##############################################################################
-
 from openerp.osv import fields, osv
-from osv.orm import intersect, except_orm
-import tools.sql
+from openerp.osv.orm import intersect
 from openerp.tools.translate import _
-from openerp.addons.decimal_precision import decimal_precision as dp
-
 
 class account_analytic_account(osv.osv):
     _name = "account.analytic.account"
diff --git a/addons/audittrail/audittrail.py b/addons/audittrail/audittrail.py
index ff2ad7f818d..7364ea505f6 100644
--- a/addons/audittrail/audittrail.py
+++ b/addons/audittrail/audittrail.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields, osv
-from osv.osv import object_proxy
+from openerp.osv.osv import object_proxy
 from openerp.tools.translate import _
 from openerp import pooler
 import time
diff --git a/addons/base_calendar/crm_meeting.py b/addons/base_calendar/crm_meeting.py
index a2a7578b67a..84a8911b44c 100644
--- a/addons/base_calendar/crm_meeting.py
+++ b/addons/base_calendar/crm_meeting.py
@@ -24,7 +24,7 @@ from openerp import tools
 from openerp.tools.translate import _
 
 from base_calendar import get_real_ids, base_calendar_id2real_id
-from base_status.base_state import base_state
+from openerp.addons.base_status.base_state import base_state
 #
 # crm.meeting is defined here so that it may be used by modules other than crm,
 # without forcing the installation of crm.
diff --git a/addons/base_crypt/__init__.py b/addons/base_crypt/__init__.py
index 921c536b575..2534598a76f 100644
--- a/addons/base_crypt/__init__.py
+++ b/addons/base_crypt/__init__.py
@@ -18,7 +18,7 @@
 #
 ##############################################################################
 
-from service import security
+from openerp.service import security
 import crypt
 
 
diff --git a/addons/base_crypt/crypt.py b/addons/base_crypt/crypt.py
index b3cc252c566..45e6b396222 100644
--- a/addons/base_crypt/crypt.py
+++ b/addons/base_crypt/crypt.py
@@ -41,7 +41,7 @@ from string import ascii_letters, digits
 from openerp.osv import fields,osv
 from openerp import pooler
 from openerp.tools.translate import _
-from service import security
+from openerp.service import security
 import logging
 
 magic_md5 = '$1$'
diff --git a/addons/crm/crm_lead.py b/addons/crm/crm_lead.py
index 1d55697723e..89ed2108d03 100644
--- a/addons/crm/crm_lead.py
+++ b/addons/crm/crm_lead.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from base_status.base_stage import base_stage
+from openerp.addons.base_status.base_stage import base_stage
 import crm
 from datetime import datetime
 from openerp.osv import fields, osv
diff --git a/addons/crm/crm_phonecall.py b/addons/crm/crm_phonecall.py
index c290c959110..322adc715ad 100644
--- a/addons/crm/crm_phonecall.py
+++ b/addons/crm/crm_phonecall.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from base_status.base_state import base_state
+from openerp.addons.base_status.base_state import base_state
 import crm
 from datetime import datetime
 from openerp.osv import fields, osv
diff --git a/addons/crm_claim/crm_claim.py b/addons/crm_claim/crm_claim.py
index 72f971e48a4..6d6b2f8a417 100644
--- a/addons/crm_claim/crm_claim.py
+++ b/addons/crm_claim/crm_claim.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from base_status.base_stage import base_stage
+from openerp.addons.base_status.base_stage import base_stage
 import binascii
 from crm import crm
 from openerp.osv import fields, osv
diff --git a/addons/crm_helpdesk/crm_helpdesk.py b/addons/crm_helpdesk/crm_helpdesk.py
index febcc2a8da9..c8a5aca3292 100644
--- a/addons/crm_helpdesk/crm_helpdesk.py
+++ b/addons/crm_helpdesk/crm_helpdesk.py
@@ -19,8 +19,8 @@
 #
 ##############################################################################
 
-from base_status.base_state import base_state
-from base_status.base_stage import base_stage
+from openerp.addons.base_status.base_state import base_state
+from openerp.addons.base_status.base_stage import base_stage
 from crm import crm
 from openerp.osv import fields, osv
 from openerp import tools
diff --git a/addons/crm_profiling/crm_profiling.py b/addons/crm_profiling/crm_profiling.py
index 08193eeb14a..8ea08601c9a 100644
--- a/addons/crm_profiling/crm_profiling.py
+++ b/addons/crm_profiling/crm_profiling.py
@@ -20,7 +20,7 @@
 ##############################################################################
 
 from openerp.osv import fields,osv
-from osv import orm
+from openerp.osv import orm
 
 from openerp.tools.translate import _
 
diff --git a/addons/document_ftp/ftpserver/abstracted_fs.py b/addons/document_ftp/ftpserver/abstracted_fs.py
index 42793ccbc45..759e2528759 100644
--- a/addons/document_ftp/ftpserver/abstracted_fs.py
+++ b/addons/document_ftp/ftpserver/abstracted_fs.py
@@ -13,7 +13,7 @@ from openerp import pooler
 from openerp import netsvc
 import sql_db
 
-from service import security
+from openerp.service import security
 from openerp.osv import osv
 from document.nodes import get_node_context
 
diff --git a/addons/document_webdav/redirect.py b/addons/document_webdav/redirect.py
index c3dd9248f45..41cbe3b883b 100644
--- a/addons/document_webdav/redirect.py
+++ b/addons/document_webdav/redirect.py
@@ -22,8 +22,8 @@
 
 import logging
 import urlparse
-from service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
-from service.http_server import HttpLogHandler
+from openerp.service.websrv_lib import FixSendError, HTTPHandler, HttpOptions
+from openerp.service.http_server import HttpLogHandler
 _logger = logging.getLogger(__name__)
 class RedirectHTTPHandler(HttpLogHandler, FixSendError, HttpOptions, HTTPHandler):
     
diff --git a/addons/document_webdav/webdav_server.py b/addons/document_webdav/webdav_server.py
index 35ec1d4d07a..f801a56ee97 100644
--- a/addons/document_webdav/webdav_server.py
+++ b/addons/document_webdav/webdav_server.py
@@ -48,8 +48,8 @@ except ImportError:
     from DAV.utils import IfParser, TagList
     from DAV.errors import DAV_Error, DAV_Forbidden, DAV_NotFound
     from DAV.propfind import PROPFIND
-from service import http_server
-from service.websrv_lib import FixSendError, HttpOptions
+from openerp.service import http_server
+from openerp.service.websrv_lib import FixSendError, HttpOptions
 from BaseHTTPServer import BaseHTTPRequestHandler
 import urlparse
 import urllib
@@ -433,7 +433,7 @@ class DAVHandler(DAVRequestHandler, HttpOptions, FixSendError):
                 data['lockowner'] = owners
         return data
 
-from service.http_server import reg_http_service,OpenERPAuthProvider
+from openerp.service.http_server import reg_http_service,OpenERPAuthProvider
 
 class DAVAuthProvider(OpenERPAuthProvider):
     def authenticate(self, db, user, passwd, client_address):
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 449be3079e5..214c273ffb8 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -22,7 +22,7 @@
 import time
 from openerp import tools
 
-from base_status.base_stage import base_stage
+from openerp.addons.base_status.base_stage import base_stage
 from datetime import datetime
 from openerp.osv import fields, osv
 from openerp.tools.translate import _
diff --git a/addons/project_issue/project_issue.py b/addons/project_issue/project_issue.py
index 994be956b45..3f60339a4fd 100644
--- a/addons/project_issue/project_issue.py
+++ b/addons/project_issue/project_issue.py
@@ -19,7 +19,7 @@
 #
 ##############################################################################
 
-from base_status.base_stage import base_stage
+from openerp.addons.base_status.base_stage import base_stage
 from crm import crm
 from datetime import datetime
 from openerp.osv import fields,osv