diff --git a/nodepool/builder.py b/nodepool/builder.py
index 2c0d7893e..b889f73ad 100644
--- a/nodepool/builder.py
+++ b/nodepool/builder.py
@@ -23,11 +23,11 @@ import time
 import shlex
 import sys
 
-import config as nodepool_config
-import exceptions
-import provider_manager
-import stats
-import zk
+from nodepool import config as nodepool_config
+from nodepool import exceptions
+from nodepool import provider_manager
+from nodepool import stats
+from nodepool import zk
 
 
 MINS = 60
diff --git a/nodepool/cmd/nodepoolcmd.py b/nodepool/cmd/nodepoolcmd.py
index 13313e02f..7047b15ce 100644
--- a/nodepool/cmd/nodepoolcmd.py
+++ b/nodepool/cmd/nodepoolcmd.py
@@ -17,13 +17,14 @@
 import logging.config
 import sys
 
+from prettytable import PrettyTable
+
 from nodepool import launcher
 from nodepool import provider_manager
 from nodepool import status
 from nodepool import zk
 from nodepool.cmd import NodepoolApp
-from config_validator import ConfigValidator
-from prettytable import PrettyTable
+from nodepool.cmd.config_validator import ConfigValidator
 
 log = logging.getLogger(__name__)
 
diff --git a/nodepool/config.py b/nodepool/config.py
index 03fc0275e..ea06f6387 100644
--- a/nodepool/config.py
+++ b/nodepool/config.py
@@ -21,8 +21,8 @@ from six.moves import configparser as ConfigParser
 import time
 import yaml
 
-import fakeprovider
-import zk
+from nodepool import fakeprovider
+from nodepool import zk
 
 
 class ConfigValue(object):
diff --git a/nodepool/fakeprovider.py b/nodepool/fakeprovider.py
index c1cbbe569..fa55f6953 100644
--- a/nodepool/fakeprovider.py
+++ b/nodepool/fakeprovider.py
@@ -21,7 +21,7 @@ import uuid
 
 import shade
 
-import exceptions
+from nodepool import exceptions
 
 
 class Dummy(object):
diff --git a/nodepool/launcher.py b/nodepool/launcher.py
index b2425d446..a2054cf53 100644
--- a/nodepool/launcher.py
+++ b/nodepool/launcher.py
@@ -26,13 +26,12 @@ import socket
 import threading
 import time
 
-import exceptions
-import nodeutils as utils
-import provider_manager
-import stats
-import config as nodepool_config
-
-import zk
+from nodepool import exceptions
+from nodepool import nodeutils as utils
+from nodepool import provider_manager
+from nodepool import stats
+from nodepool import config as nodepool_config
+from nodepool import zk
 
 MINS = 60
 HOURS = 60 * MINS
diff --git a/nodepool/nodeutils.py b/nodepool/nodeutils.py
index cd8b16bdc..99960a6fa 100644
--- a/nodepool/nodeutils.py
+++ b/nodepool/nodeutils.py
@@ -25,7 +25,7 @@ import logging
 
 import paramiko
 
-import exceptions
+from nodepool import exceptions
 
 log = logging.getLogger("nodepool.utils")
 
diff --git a/nodepool/provider_manager.py b/nodepool/provider_manager.py
index b9ccef3e0..97b1ec86d 100644
--- a/nodepool/provider_manager.py
+++ b/nodepool/provider_manager.py
@@ -21,10 +21,11 @@ from contextlib import contextmanager
 
 import shade
 
-import exceptions
-import fakeprovider
-from nodeutils import iterate_timeout
-from task_manager import TaskManager, ManagerStoppedException
+from nodepool import exceptions
+from nodepool import fakeprovider
+from nodepool.nodeutils import iterate_timeout
+from nodepool.task_manager import ManagerStoppedException
+from nodepool.task_manager import TaskManager
 
 
 IPS_LIST_AGE = 5      # How long to keep a cached copy of the ip list
diff --git a/nodepool/task_manager.py b/nodepool/task_manager.py
index 227129776..8a282d25c 100644
--- a/nodepool/task_manager.py
+++ b/nodepool/task_manager.py
@@ -23,7 +23,7 @@ import logging
 import time
 import requests.exceptions
 
-import stats
+from nodepool import stats
 
 class ManagerStoppedException(Exception):
     pass
diff --git a/nodepool/webapp.py b/nodepool/webapp.py
index 288235563..752489e4f 100644
--- a/nodepool/webapp.py
+++ b/nodepool/webapp.py
@@ -20,7 +20,7 @@ from paste import httpserver
 import webob
 from webob import dec
 
-import status
+from nodepool import status
 
 """Nodepool main web app.