diff --git a/monkey/infection_monkey.py b/monkey/infection_monkey.py
new file mode 100644
index 000000000..86e5f5657
--- /dev/null
+++ b/monkey/infection_monkey.py
@@ -0,0 +1,4 @@
+import infection_monkey.main
+
+if "__main__" == __name__:
+    infection_monkey.main.main()
diff --git a/monkey/infection_monkey/config.py b/monkey/infection_monkey/config.py
index 7bd651965..0d5e18ebe 100644
--- a/monkey/infection_monkey/config.py
+++ b/monkey/infection_monkey/config.py
@@ -6,9 +6,10 @@ import uuid
 from abc import ABCMeta
 from itertools import product
 
-from exploit import WmiExploiter, Ms08_067_Exploiter, SmbExploiter, RdpExploiter, SSHExploiter, ShellShockExploiter, \
-    SambaCryExploiter, ElasticGroovyExploiter
-from network import TcpScanner, PingScanner, SMBFinger, SSHFinger, HTTPFinger, MySQLFinger, ElasticFinger
+from infection_monkey.exploit import WmiExploiter, Ms08_067_Exploiter, SmbExploiter, RdpExploiter, SSHExploiter, \
+    ShellShockExploiter, SambaCryExploiter, ElasticGroovyExploiter
+from infection_monkey.network import TcpScanner, PingScanner, SMBFinger, SSHFinger, HTTPFinger, MySQLFinger, \
+    ElasticFinger
 
 __author__ = 'itamar'
 
diff --git a/monkey/infection_monkey/control.py b/monkey/infection_monkey/control.py
index d2cbc0cc0..4f3df0b60 100644
--- a/monkey/infection_monkey/control.py
+++ b/monkey/infection_monkey/control.py
@@ -6,12 +6,12 @@ from socket import gethostname
 import requests
 from requests.exceptions import ConnectionError
 
-import monkeyfs
-import tunnel
-from config import WormConfiguration, GUID
-from network.info import local_ips, check_internet_access
-from transport.http import HTTPConnectProxy
-from transport.tcp import TcpProxy
+import infection_monkey.monkeyfs as monkeyfs
+import infection_monkey.tunnel as tunnel
+from infection_monkey.config import WormConfiguration, GUID
+from infection_monkey.network.info import local_ips, check_internet_access
+from infection_monkey.transport.http import HTTPConnectProxy
+from infection_monkey.transport.tcp import TcpProxy
 
 __author__ = 'hoffer'
 
diff --git a/monkey/infection_monkey/dropper.py b/monkey/infection_monkey/dropper.py
index 6e63e5404..07d65b712 100644
--- a/monkey/infection_monkey/dropper.py
+++ b/monkey/infection_monkey/dropper.py
@@ -9,10 +9,10 @@ import sys
 import time
 from ctypes import c_char_p
 
-from config import WormConfiguration
-from exploit.tools import build_monkey_commandline_explicitly
-from model import MONKEY_CMDLINE_WINDOWS, MONKEY_CMDLINE_LINUX, GENERAL_CMDLINE_LINUX
-from system_info import SystemInfoCollector, OperatingSystem
+from infection_monkey.config import WormConfiguration
+from infection_monkey.exploit.tools import build_monkey_commandline_explicitly
+from infection_monkey.model import MONKEY_CMDLINE_WINDOWS, MONKEY_CMDLINE_LINUX, GENERAL_CMDLINE_LINUX
+from infection_monkey.system_info import SystemInfoCollector, OperatingSystem
 
 if "win32" == sys.platform:
     from win32process import DETACHED_PROCESS
diff --git a/monkey/infection_monkey/exploit/__init__.py b/monkey/infection_monkey/exploit/__init__.py
index 379d2bd92..d2b1a105e 100644
--- a/monkey/infection_monkey/exploit/__init__.py
+++ b/monkey/infection_monkey/exploit/__init__.py
@@ -33,11 +33,11 @@ class HostExploiter(object):
         raise NotImplementedError()
 
 
-from win_ms08_067 import Ms08_067_Exploiter
-from wmiexec import WmiExploiter
-from smbexec import SmbExploiter
-from rdpgrinder import RdpExploiter
-from sshexec import SSHExploiter
-from shellshock import ShellShockExploiter
-from sambacry import SambaCryExploiter
-from elasticgroovy import ElasticGroovyExploiter
+from infection_monkey.exploit.win_ms08_067 import Ms08_067_Exploiter
+from infection_monkey.exploit.wmiexec import WmiExploiter
+from infection_monkey.exploit.smbexec import SmbExploiter
+from infection_monkey.exploit.rdpgrinder import RdpExploiter
+from infection_monkey.exploit.sshexec import SSHExploiter
+from infection_monkey.exploit.shellshock import ShellShockExploiter
+from infection_monkey.exploit.sambacry import SambaCryExploiter
+from infection_monkey.exploit.elasticgroovy import ElasticGroovyExploiter
diff --git a/monkey/infection_monkey/exploit/elasticgroovy.py b/monkey/infection_monkey/exploit/elasticgroovy.py
index 989ae5cdf..4dbd20e7b 100644
--- a/monkey/infection_monkey/exploit/elasticgroovy.py
+++ b/monkey/infection_monkey/exploit/elasticgroovy.py
@@ -9,10 +9,11 @@ import logging
 
 import requests
 
-from exploit import HostExploiter
-from model import DROPPER_ARG
-from network.elasticfinger import ES_SERVICE, ES_PORT
-from tools import get_target_monkey, HTTPTools, build_monkey_commandline, get_monkey_depth
+import infection_monkey.config
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.model import DROPPER_ARG
+from infection_monkey.network.elasticfinger import ES_SERVICE, ES_PORT
+from infection_monkey.exploit.tools import get_target_monkey, HTTPTools, build_monkey_commandline, get_monkey_depth
 
 __author__ = 'danielg'
 
@@ -38,7 +39,7 @@ class ElasticGroovyExploiter(HostExploiter):
 
     def __init__(self, host):
         super(ElasticGroovyExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self.skip_exist = self._config.skip_exploit_if_file_exist
 
     def is_os_supported(self):
diff --git a/monkey/infection_monkey/exploit/rdpgrinder.py b/monkey/infection_monkey/exploit/rdpgrinder.py
index 5d73c8279..6b0110e47 100644
--- a/monkey/infection_monkey/exploit/rdpgrinder.py
+++ b/monkey/infection_monkey/exploit/rdpgrinder.py
@@ -9,12 +9,13 @@ from rdpy.core.error import RDPSecurityNegoFail
 from rdpy.protocol.rdp import rdp
 from twisted.internet import reactor
 
-from exploit import HostExploiter
-from exploit.tools import HTTPTools, get_monkey_depth
-from exploit.tools import get_target_monkey
-from model import RDP_CMDLINE_HTTP_BITS, RDP_CMDLINE_HTTP_VBS
-from network.tools import check_tcp_port
-from tools import build_monkey_commandline
+import infection_monkey.config
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.exploit.tools import HTTPTools, get_monkey_depth
+from infection_monkey.exploit.tools import get_target_monkey
+from infection_monkey.model import RDP_CMDLINE_HTTP_BITS, RDP_CMDLINE_HTTP_VBS
+from infection_monkey.network.tools import check_tcp_port
+from infection_monkey.exploit.tools import build_monkey_commandline
 
 __author__ = 'hoffer'
 
@@ -237,8 +238,8 @@ class RdpExploiter(HostExploiter):
 
     def __init__(self, host):
         super(RdpExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
+        self._config = infection_monkey.config.WormConfiguration
+        self._guid = infection_monkey.config.GUID
 
     def is_os_supported(self):
         if super(RdpExploiter, self).is_os_supported():
diff --git a/monkey/infection_monkey/exploit/sambacry.py b/monkey/infection_monkey/exploit/sambacry.py
index 930cd8854..d9d683bdd 100644
--- a/monkey/infection_monkey/exploit/sambacry.py
+++ b/monkey/infection_monkey/exploit/sambacry.py
@@ -15,11 +15,12 @@ from impacket.smb3structs import SMB2_IL_IMPERSONATION, SMB2_CREATE, SMB2_FLAGS_
     SMB2Packet, SMB2Create_Response, SMB2_OPLOCK_LEVEL_NONE
 from impacket.smbconnection import SMBConnection
 
-import monkeyfs
-from exploit import HostExploiter
-from model import DROPPER_ARG
-from network.smbfinger import SMB_SERVICE
-from tools import build_monkey_commandline, get_target_monkey_by_os, get_binaries_dir_path, get_monkey_depth
+import infection_monkey.config
+import infection_monkey.monkeyfs as monkeyfs
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.model import DROPPER_ARG
+from infection_monkey.network.smbfinger import SMB_SERVICE
+from infection_monkey.exploit.tools import build_monkey_commandline, get_target_monkey_by_os, get_binaries_dir_path, get_monkey_depth
 
 __author__ = 'itay.mizeretz'
 
@@ -52,7 +53,7 @@ class SambaCryExploiter(HostExploiter):
 
     def __init__(self, host):
         super(SambaCryExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
 
     def exploit_host(self):
         if not self.is_vulnerable():
diff --git a/monkey/infection_monkey/exploit/shellshock.py b/monkey/infection_monkey/exploit/shellshock.py
index bca03b6ea..91f8a4768 100644
--- a/monkey/infection_monkey/exploit/shellshock.py
+++ b/monkey/infection_monkey/exploit/shellshock.py
@@ -6,11 +6,12 @@ from random import choice
 
 import requests
 
-from exploit import HostExploiter
-from exploit.tools import get_target_monkey, HTTPTools, get_monkey_depth
-from model import MONKEY_ARG
-from shellshock_resources import CGI_FILES
-from tools import build_monkey_commandline
+import infection_monkey.config
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.exploit.tools import get_target_monkey, HTTPTools, get_monkey_depth
+from infection_monkey.model import MONKEY_ARG
+from infection_monkey.exploit.shellshock_resources import CGI_FILES
+from infection_monkey.exploit.tools import build_monkey_commandline
 
 __author__ = 'danielg'
 
@@ -29,7 +30,7 @@ class ShellShockExploiter(HostExploiter):
 
     def __init__(self, host):
         super(ShellShockExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self.HTTP = [str(port) for port in self._config.HTTP_PORTS]
         self.success_flag = ''.join(
             choice(string.ascii_uppercase + string.digits
diff --git a/monkey/infection_monkey/exploit/smbexec.py b/monkey/infection_monkey/exploit/smbexec.py
index d3b27f79d..7e6b68b20 100644
--- a/monkey/infection_monkey/exploit/smbexec.py
+++ b/monkey/infection_monkey/exploit/smbexec.py
@@ -3,12 +3,13 @@ from logging import getLogger
 from impacket.dcerpc.v5 import transport, scmr
 from impacket.smbconnection import SMB_DIALECT
 
-from exploit import HostExploiter
-from exploit.tools import SmbTools, get_target_monkey, get_monkey_depth
-from model import MONKEY_CMDLINE_DETACHED_WINDOWS, DROPPER_CMDLINE_DETACHED_WINDOWS
-from network import SMBFinger
-from network.tools import check_tcp_port
-from tools import build_monkey_commandline
+import infection_monkey.config
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.exploit.tools import SmbTools, get_target_monkey, get_monkey_depth
+from infection_monkey.model import MONKEY_CMDLINE_DETACHED_WINDOWS, DROPPER_CMDLINE_DETACHED_WINDOWS
+from infection_monkey.network import SMBFinger
+from infection_monkey.network.tools import check_tcp_port
+from infection_monkey.exploit.tools import build_monkey_commandline
 
 LOG = getLogger(__name__)
 
@@ -23,8 +24,8 @@ class SmbExploiter(HostExploiter):
 
     def __init__(self, host):
         super(SmbExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
+        self._config = infection_monkey.config.WormConfiguration
+        self._guid = infection_monkey.config.GUID
 
     def is_os_supported(self):
         if super(SmbExploiter, self).is_os_supported():
diff --git a/monkey/infection_monkey/exploit/sshexec.py b/monkey/infection_monkey/exploit/sshexec.py
index b93970ca9..6be9621cc 100644
--- a/monkey/infection_monkey/exploit/sshexec.py
+++ b/monkey/infection_monkey/exploit/sshexec.py
@@ -3,12 +3,13 @@ import time
 
 import paramiko
 
-import monkeyfs
-from exploit import HostExploiter
-from exploit.tools import get_target_monkey, get_monkey_depth
-from model import MONKEY_ARG
-from network.tools import check_tcp_port
-from tools import build_monkey_commandline
+import infection_monkey.monkeyfs as monkeyfs
+import infection_monkey.config
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.exploit.tools import get_target_monkey, get_monkey_depth
+from infection_monkey.model import MONKEY_ARG
+from infection_monkey.network.tools import check_tcp_port
+from infection_monkey.exploit.tools import build_monkey_commandline
 
 __author__ = 'hoffer'
 
@@ -22,7 +23,7 @@ class SSHExploiter(HostExploiter):
 
     def __init__(self, host):
         super(SSHExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self._update_timestamp = 0
         self.skip_exist = self._config.skip_exploit_if_file_exist
 
diff --git a/monkey/infection_monkey/exploit/tools.py b/monkey/infection_monkey/exploit/tools.py
index dbbd8070a..31586417c 100644
--- a/monkey/infection_monkey/exploit/tools.py
+++ b/monkey/infection_monkey/exploit/tools.py
@@ -17,11 +17,12 @@ from impacket.dcerpc.v5.dtypes import NULL
 from impacket.smb3structs import SMB2_DIALECT_002, SMB2_DIALECT_21
 from impacket.smbconnection import SMBConnection, SMB_DIALECT
 
-import monkeyfs
-from network import local_ips
-from network.firewall import app as firewall
-from network.info import get_free_tcp_port, get_routes
-from transport import HTTPServer
+import infection_monkey.config
+import infection_monkey.monkeyfs as monkeyfs
+from infection_monkey.network import local_ips
+from infection_monkey.network.firewall import app as firewall
+from infection_monkey.network.info import get_free_tcp_port, get_routes
+from infection_monkey.transport import HTTPServer
 
 
 class DceRpcException(Exception):
@@ -173,8 +174,7 @@ class SmbTools(object):
     @staticmethod
     def copy_file(host, src_path, dst_path, username, password, lm_hash='', ntlm_hash='', timeout=60):
         assert monkeyfs.isfile(src_path), "Source file to copy (%s) is missing" % (src_path,)
-
-        config = __import__('config').WormConfiguration
+        config = infection_monkey.config.WormConfiguration
         src_file_size = monkeyfs.getsize(src_path)
 
         smb, dialect = SmbTools.new_smb_connection(host, username, password, lm_hash, ntlm_hash, timeout)
@@ -466,7 +466,7 @@ def build_monkey_commandline_explicitly(parent=None, tunnel=None, server=None, d
 
 
 def build_monkey_commandline(target_host, depth, location=None):
-    from config import GUID
+    from infection_monkey.config import GUID
     return build_monkey_commandline_explicitly(
         GUID, target_host.default_tunnel, target_host.default_server, depth, location)
 
@@ -479,5 +479,5 @@ def get_binaries_dir_path():
 
 
 def get_monkey_depth():
-    from config import WormConfiguration
+    from infection_monkey.config import WormConfiguration
     return WormConfiguration.depth
diff --git a/monkey/infection_monkey/exploit/win_ms08_067.py b/monkey/infection_monkey/exploit/win_ms08_067.py
index 85086bce7..b25289543 100644
--- a/monkey/infection_monkey/exploit/win_ms08_067.py
+++ b/monkey/infection_monkey/exploit/win_ms08_067.py
@@ -14,11 +14,12 @@ from enum import IntEnum
 from impacket import uuid
 from impacket.dcerpc.v5 import transport
 
-from exploit.tools import SmbTools, get_target_monkey, get_monkey_depth
-from model import DROPPER_CMDLINE_WINDOWS, MONKEY_CMDLINE_WINDOWS
-from network import SMBFinger
-from network.tools import check_tcp_port
-from tools import build_monkey_commandline
+import infection_monkey.config
+from infection_monkey.exploit.tools import SmbTools, get_target_monkey, get_monkey_depth
+from infection_monkey.model import DROPPER_CMDLINE_WINDOWS, MONKEY_CMDLINE_WINDOWS
+from infection_monkey.network import SMBFinger
+from infection_monkey.network.tools import check_tcp_port
+from infection_monkey.exploit.tools import build_monkey_commandline
 from . import HostExploiter
 
 LOG = getLogger(__name__)
@@ -158,8 +159,8 @@ class Ms08_067_Exploiter(HostExploiter):
 
     def __init__(self, host):
         super(Ms08_067_Exploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
+        self._config = infection_monkey.config.WormConfiguration
+        self._guid = infection_monkey.config.GUID
 
     def is_os_supported(self):
         if self.host.os.get('type') in self._TARGET_OS_TYPE and \
diff --git a/monkey/infection_monkey/exploit/wmiexec.py b/monkey/infection_monkey/exploit/wmiexec.py
index 0f9b2ee4c..26cae60c3 100644
--- a/monkey/infection_monkey/exploit/wmiexec.py
+++ b/monkey/infection_monkey/exploit/wmiexec.py
@@ -5,10 +5,11 @@ import traceback
 
 from impacket.dcerpc.v5.rpcrt import DCERPCException
 
-from exploit import HostExploiter
-from exploit.tools import SmbTools, WmiTools, AccessDeniedException, get_target_monkey, get_monkey_depth
-from model import DROPPER_CMDLINE_WINDOWS, MONKEY_CMDLINE_WINDOWS
-from tools import build_monkey_commandline
+import infection_monkey.config
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.exploit.tools import SmbTools, WmiTools, AccessDeniedException, get_target_monkey, \
+    get_monkey_depth, build_monkey_commandline
+from infection_monkey.model import DROPPER_CMDLINE_WINDOWS, MONKEY_CMDLINE_WINDOWS
 
 LOG = logging.getLogger(__name__)
 
@@ -18,8 +19,8 @@ class WmiExploiter(HostExploiter):
 
     def __init__(self, host):
         super(WmiExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
+        self._config = infection_monkey.config.WormConfiguration
+        self._guid = infection_monkey.config.GUID
 
     @WmiTools.dcom_wrap
     def exploit_host(self):
diff --git a/monkey/infection_monkey/main.py b/monkey/infection_monkey/main.py
index 4ff4917b9..98be6895f 100644
--- a/monkey/infection_monkey/main.py
+++ b/monkey/infection_monkey/main.py
@@ -8,14 +8,11 @@ import os
 import sys
 import traceback
 
-from config import WormConfiguration, EXTERNAL_CONFIG_FILE
-from dropper import MonkeyDrops
-from model import MONKEY_ARG, DROPPER_ARG
+import infection_monkey.utils as utils
+from infection_monkey.config import WormConfiguration, EXTERNAL_CONFIG_FILE
+from infection_monkey.dropper import MonkeyDrops
+from infection_monkey.model import MONKEY_ARG, DROPPER_ARG
 from infection_monkey.monkey import InfectionMonkey
-import utils
-
-if __name__ == "__main__":
-    sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
 
 __author__ = 'itamar'
 
diff --git a/monkey/infection_monkey/model/__init__.py b/monkey/infection_monkey/model/__init__.py
index 1296570e1..27c1cc61b 100644
--- a/monkey/infection_monkey/model/__init__.py
+++ b/monkey/infection_monkey/model/__init__.py
@@ -1,4 +1,4 @@
-from host import VictimHost
+from infection_monkey.model.host import VictimHost
 
 __author__ = 'itamar'
 
diff --git a/monkey/infection_monkey/monkey-linux.spec b/monkey/infection_monkey/monkey-linux.spec
index fac69536e..61a2725c4 100644
--- a/monkey/infection_monkey/monkey-linux.spec
+++ b/monkey/infection_monkey/monkey-linux.spec
@@ -4,7 +4,7 @@ block_cipher = None
 
 
 a = Analysis(['main.py'],
-             pathex=['.', '..'],
+             pathex=['..'],
              binaries=None,
              datas=None,
              hiddenimports=['_cffi_backend'],
diff --git a/monkey/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
index 8ad1baf8c..efdb43a3c 100644
--- a/monkey/infection_monkey/monkey.py
+++ b/monkey/infection_monkey/monkey.py
@@ -4,18 +4,18 @@ import os
 import subprocess
 import sys
 import time
-
-import tunnel
-import utils
-from config import WormConfiguration
-from control import ControlClient
-from model import DELAY_DELETE_CMD
-from network.firewall import app as firewall
-from network.network_scanner import NetworkScanner
 from six.moves import xrange
-from system_info import SystemInfoCollector
-from system_singleton import SystemSingleton
-from windows_upgrader import WindowsUpgrader
+
+import infection_monkey.tunnel as tunnel
+import infection_monkey.utils as utils
+from infection_monkey.config import WormConfiguration
+from infection_monkey.control import ControlClient
+from infection_monkey.model import DELAY_DELETE_CMD
+from infection_monkey.network.firewall import app as firewall
+from infection_monkey.network.network_scanner import NetworkScanner
+from infection_monkey.system_info import SystemInfoCollector
+from infection_monkey.system_singleton import SystemSingleton
+from infection_monkey.windows_upgrader import WindowsUpgrader
 
 __author__ = 'itamar'
 
diff --git a/monkey/infection_monkey/monkey.spec b/monkey/infection_monkey/monkey.spec
index cb9c6130e..07e9e81d3 100644
--- a/monkey/infection_monkey/monkey.spec
+++ b/monkey/infection_monkey/monkey.spec
@@ -2,7 +2,7 @@
 import os
 import platform
 a = Analysis(['main.py'],
-             pathex=['.', '..'],
+             pathex=['..'],
              hiddenimports=['_cffi_backend', 'queue'],
              hookspath=None,
              runtime_hooks=None)
diff --git a/monkey/infection_monkey/network/__init__.py b/monkey/infection_monkey/network/__init__.py
index a1df9d2e9..abd08460e 100644
--- a/monkey/infection_monkey/network/__init__.py
+++ b/monkey/infection_monkey/network/__init__.py
@@ -18,12 +18,12 @@ class HostFinger(object):
     def get_host_fingerprint(self, host):
         raise NotImplementedError()
 
-from ping_scanner import PingScanner
-from tcp_scanner import TcpScanner
-from smbfinger import SMBFinger
-from sshfinger import SSHFinger
-from httpfinger import HTTPFinger
-from elasticfinger import ElasticFinger
-from mysqlfinger import MySQLFinger
-from info import local_ips
-from info import get_free_tcp_port
+
+from infection_monkey.network.ping_scanner import PingScanner
+from infection_monkey.network.tcp_scanner import TcpScanner
+from infection_monkey.network.smbfinger import SMBFinger
+from infection_monkey.network.sshfinger import SSHFinger
+from infection_monkey.network.httpfinger import HTTPFinger
+from infection_monkey.network.elasticfinger import ElasticFinger
+from infection_monkey.network.mysqlfinger import MySQLFinger
+from infection_monkey.network.info import local_ips, get_free_tcp_port
diff --git a/monkey/infection_monkey/network/elasticfinger.py b/monkey/infection_monkey/network/elasticfinger.py
index 730decf4f..3d62de687 100644
--- a/monkey/infection_monkey/network/elasticfinger.py
+++ b/monkey/infection_monkey/network/elasticfinger.py
@@ -5,8 +5,9 @@ from contextlib import closing
 import requests
 from requests.exceptions import Timeout, ConnectionError
 
-from model.host import VictimHost
-from network import HostFinger
+import infection_monkey.config
+from infection_monkey.model.host import VictimHost
+from infection_monkey.network import HostFinger
 
 ES_PORT = 9200
 ES_SERVICE = 'elastic-search-9200'
@@ -21,7 +22,7 @@ class ElasticFinger(HostFinger):
     """
 
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
 
     def get_host_fingerprint(self, host):
         """
diff --git a/monkey/infection_monkey/network/httpfinger.py b/monkey/infection_monkey/network/httpfinger.py
index 437edbf6c..829c6b1b5 100644
--- a/monkey/infection_monkey/network/httpfinger.py
+++ b/monkey/infection_monkey/network/httpfinger.py
@@ -1,16 +1,18 @@
-from network import HostFinger
-from model.host import VictimHost
+import infection_monkey.config
+from infection_monkey.network import HostFinger
+from infection_monkey.model.host import VictimHost
 import logging
 
 LOG = logging.getLogger(__name__)
 
+
 class HTTPFinger(HostFinger):
     """
     Goal is to recognise HTTP servers, where what we currently care about is apache.
     """
 
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self.HTTP = [(port, str(port)) for port in self._config.HTTP_PORTS]
 
     @staticmethod
diff --git a/monkey/infection_monkey/network/mysqlfinger.py b/monkey/infection_monkey/network/mysqlfinger.py
index 39baa05ac..70080c12b 100644
--- a/monkey/infection_monkey/network/mysqlfinger.py
+++ b/monkey/infection_monkey/network/mysqlfinger.py
@@ -1,9 +1,10 @@
 import logging
 import socket
 
-from model.host import VictimHost
-from network import HostFinger
-from .tools import struct_unpack_tracker, struct_unpack_tracker_string
+import infection_monkey.config
+from infection_monkey.model.host import VictimHost
+from infection_monkey.network import HostFinger
+from infection_monkey.network.tools import struct_unpack_tracker, struct_unpack_tracker_string
 
 MYSQL_PORT = 3306
 SQL_SERVICE = 'mysqld-3306'
@@ -20,7 +21,7 @@ class MySQLFinger(HostFinger):
     HEADER_SIZE = 4  # in bytes
 
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
 
     def get_host_fingerprint(self, host):
         """
diff --git a/monkey/infection_monkey/network/network_scanner.py b/monkey/infection_monkey/network/network_scanner.py
index 563b04b6d..cc0788154 100644
--- a/monkey/infection_monkey/network/network_scanner.py
+++ b/monkey/infection_monkey/network/network_scanner.py
@@ -1,11 +1,11 @@
 import logging
 import time
 
-from config import WormConfiguration
-from info import local_ips, get_interfaces_ranges
 from common.network.network_range import *
-from model import VictimHost
-from . import HostScanner
+from infection_monkey.config import WormConfiguration
+from infection_monkey.network.info import local_ips, get_interfaces_ranges
+from infection_monkey.model import VictimHost
+from infection_monkey.network import HostScanner
 
 __author__ = 'itamar'
 
diff --git a/monkey/infection_monkey/network/ping_scanner.py b/monkey/infection_monkey/network/ping_scanner.py
index 7162c36f3..075b57669 100644
--- a/monkey/infection_monkey/network/ping_scanner.py
+++ b/monkey/infection_monkey/network/ping_scanner.py
@@ -4,8 +4,9 @@ import re
 import subprocess
 import sys
 
-from model.host import VictimHost
-from . import HostScanner, HostFinger
+import infection_monkey.config
+from infection_monkey.model.host import VictimHost
+from infection_monkey.network import HostScanner, HostFinger
 
 __author__ = 'itamar'
 
@@ -20,7 +21,7 @@ LOG = logging.getLogger(__name__)
 
 class PingScanner(HostScanner, HostFinger):
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self._devnull = open(os.devnull, "w")
         self._ttl_regex = re.compile(TTL_REGEX_STR, re.IGNORECASE)
 
diff --git a/monkey/infection_monkey/network/smbfinger.py b/monkey/infection_monkey/network/smbfinger.py
index 9ccb52422..ab92f2761 100644
--- a/monkey/infection_monkey/network/smbfinger.py
+++ b/monkey/infection_monkey/network/smbfinger.py
@@ -1,10 +1,11 @@
 import socket
 import struct
 import logging
-from network import HostFinger
-from model.host import VictimHost
 from odict import odict
 
+from infection_monkey.network import HostFinger
+from infection_monkey.model.host import VictimHost
+
 SMB_PORT = 445
 SMB_SERVICE = 'tcp-445'
 
@@ -100,7 +101,8 @@ class SMBSessionFingerData(Packet):
 
 class SMBFinger(HostFinger):
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        from infection_monkey.config import WormConfiguration
+        self._config = WormConfiguration
 
     def get_host_fingerprint(self, host):
         assert isinstance(host, VictimHost)
diff --git a/monkey/infection_monkey/network/sshfinger.py b/monkey/infection_monkey/network/sshfinger.py
index 89c3092d7..21deb8814 100644
--- a/monkey/infection_monkey/network/sshfinger.py
+++ b/monkey/infection_monkey/network/sshfinger.py
@@ -1,8 +1,9 @@
 import re
 
-from model.host import VictimHost
-from network import HostFinger
-from network.tools import check_tcp_port
+import infection_monkey.config
+from infection_monkey.model.host import VictimHost
+from infection_monkey.network import HostFinger
+from infection_monkey.network.tools import check_tcp_port
 
 SSH_PORT = 22
 SSH_SERVICE_DEFAULT = 'tcp-22'
@@ -14,7 +15,7 @@ LINUX_DIST_SSH = ['ubuntu', 'debian']
 
 class SSHFinger(HostFinger):
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self._banner_regex = re.compile(SSH_REGEX, re.IGNORECASE)
 
     @staticmethod
diff --git a/monkey/infection_monkey/network/tcp_scanner.py b/monkey/infection_monkey/network/tcp_scanner.py
index e291e8d3e..d8e861590 100644
--- a/monkey/infection_monkey/network/tcp_scanner.py
+++ b/monkey/infection_monkey/network/tcp_scanner.py
@@ -1,8 +1,9 @@
 from itertools import izip_longest
 from random import shuffle
 
-from network import HostScanner, HostFinger
-from network.tools import check_tcp_ports
+import infection_monkey.config
+from infection_monkey.network import HostScanner, HostFinger
+from infection_monkey.network.tools import check_tcp_ports
 
 __author__ = 'itamar'
 
@@ -11,7 +12,7 @@ BANNER_READ = 1024
 
 class TcpScanner(HostScanner, HostFinger):
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
 
     def is_host_alive(self, host):
         return self.get_host_fingerprint(host, True)
diff --git a/monkey/infection_monkey/system_info/__init__.py b/monkey/infection_monkey/system_info/__init__.py
index 667ff9890..fbfbcbd7a 100644
--- a/monkey/infection_monkey/system_info/__init__.py
+++ b/monkey/infection_monkey/system_info/__init__.py
@@ -5,8 +5,8 @@ import sys
 import psutil
 from enum import IntEnum
 
-from network.info import get_host_subnets
-from azure_cred_collector import AzureCollector
+from infection_monkey.network.info import get_host_subnets
+from infection_monkey.system_info.azure_cred_collector import AzureCollector
 
 LOG = logging.getLogger(__name__)
 
@@ -112,7 +112,7 @@ class InfoCollector(object):
         Updates the credentials structure, creating it if neccesary (compat with mimikatz)
         :return: None. Updates class information
         """
-        from config import WormConfiguration
+        from infection_monkey.config import WormConfiguration
         if not WormConfiguration.extract_azure_creds:
             return
         LOG.debug("Harvesting creds if on an Azure machine")
diff --git a/monkey/infection_monkey/system_info/mimikatz_collector.py b/monkey/infection_monkey/system_info/mimikatz_collector.py
index 65f326256..f221fce5a 100644
--- a/monkey/infection_monkey/system_info/mimikatz_collector.py
+++ b/monkey/infection_monkey/system_info/mimikatz_collector.py
@@ -3,6 +3,8 @@ import ctypes
 import logging
 import socket
 
+import infection_monkey.config
+
 __author__ = 'itay.mizeretz'
 
 LOG = logging.getLogger(__name__)
@@ -17,7 +19,7 @@ class MimikatzCollector(object):
         try:
 
             self._isInit = False
-            self._config = __import__('config').WormConfiguration
+            self._config = infection_monkey.config.WormConfiguration
             self._dll = ctypes.WinDLL(self._config.mimikatz_dll_name)
             collect_proto = ctypes.WINFUNCTYPE(ctypes.c_int)
             get_proto = ctypes.WINFUNCTYPE(MimikatzCollector.LogonData)
diff --git a/monkey/infection_monkey/system_info/windows_info_collector.py b/monkey/infection_monkey/system_info/windows_info_collector.py
index 610c4e8e3..0a46322cd 100644
--- a/monkey/infection_monkey/system_info/windows_info_collector.py
+++ b/monkey/infection_monkey/system_info/windows_info_collector.py
@@ -1,7 +1,7 @@
 import logging
 
-from mimikatz_collector import MimikatzCollector
-from . import InfoCollector
+from infection_monkey.system_info.mimikatz_collector import MimikatzCollector
+from infection_monkey.system_info import InfoCollector
 
 LOG = logging.getLogger(__name__)
 
diff --git a/monkey/infection_monkey/system_singleton.py b/monkey/infection_monkey/system_singleton.py
index 970905a9c..9f56c238e 100644
--- a/monkey/infection_monkey/system_singleton.py
+++ b/monkey/infection_monkey/system_singleton.py
@@ -3,7 +3,7 @@ import logging
 import sys
 from abc import ABCMeta, abstractmethod
 
-from config import WormConfiguration
+from infection_monkey.config import WormConfiguration
 
 __author__ = 'itamar'
 
diff --git a/monkey/infection_monkey/test/config__test.py b/monkey/infection_monkey/test/config__test.py
index accdd5a49..fc51e0141 100644
--- a/monkey/infection_monkey/test/config__test.py
+++ b/monkey/infection_monkey/test/config__test.py
@@ -6,9 +6,9 @@ import unittest
 
 from mock import Mock, patch
 
-import control
+import infection_monkey.control as control
 
-from config import GUID
+from infection_monkey.config import GUID
 
 
 class ReportConfigErrorTestCase(unittest.TestCase):
diff --git a/monkey/infection_monkey/transport/__init__.py b/monkey/infection_monkey/transport/__init__.py
index 651964fcb..961ff3c9a 100644
--- a/monkey/infection_monkey/transport/__init__.py
+++ b/monkey/infection_monkey/transport/__init__.py
@@ -1,4 +1,4 @@
-from ftp import FTPServer
-from http import HTTPServer
+from infection_monkey.transport.ftp import FTPServer
+from infection_monkey.transport.http import HTTPServer
 
 __author__ = 'hoffer'
diff --git a/monkey/infection_monkey/transport/base.py b/monkey/infection_monkey/transport/base.py
index dae0ff072..e6a5bc366 100644
--- a/monkey/infection_monkey/transport/base.py
+++ b/monkey/infection_monkey/transport/base.py
@@ -3,6 +3,7 @@ from threading import Thread
 
 g_last_served = None
 
+
 class TransportProxyBase(Thread):
     def __init__(self, local_port, dest_host=None, dest_port=None, local_host=''):
         global g_last_served
diff --git a/monkey/infection_monkey/transport/ftp.py b/monkey/infection_monkey/transport/ftp.py
index c90f8c484..4849f570e 100644
--- a/monkey/infection_monkey/transport/ftp.py
+++ b/monkey/infection_monkey/transport/ftp.py
@@ -1,4 +1,6 @@
-import socket, threading, time
+import socket
+import threading
+import time
 import StringIO
 
 __author__ = 'hoffer'
diff --git a/monkey/infection_monkey/transport/http.py b/monkey/infection_monkey/transport/http.py
index 8d07fd155..c2ad996dd 100644
--- a/monkey/infection_monkey/transport/http.py
+++ b/monkey/infection_monkey/transport/http.py
@@ -7,8 +7,8 @@ import urllib
 from logging import getLogger
 from urlparse import urlsplit
 
-import monkeyfs
-from base import TransportProxyBase, update_last_serve_time
+import infection_monkey.monkeyfs as monkeyfs
+from infection_monkey.transport.base import TransportProxyBase, update_last_serve_time
 
 __author__ = 'hoffer'
 
diff --git a/monkey/infection_monkey/transport/tcp.py b/monkey/infection_monkey/transport/tcp.py
index eaa94de1c..e910e657f 100644
--- a/monkey/infection_monkey/transport/tcp.py
+++ b/monkey/infection_monkey/transport/tcp.py
@@ -1,9 +1,10 @@
 import socket
 import select
 from threading import Thread
-from base import TransportProxyBase, update_last_serve_time
 from logging import getLogger
 
+from infection_monkey.transport.base import TransportProxyBase, update_last_serve_time
+
 READ_BUFFER_SIZE = 8192
 DEFAULT_TIMEOUT = 30
 
diff --git a/monkey/infection_monkey/tunnel.py b/monkey/infection_monkey/tunnel.py
index 9a50679ff..d589ac98b 100644
--- a/monkey/infection_monkey/tunnel.py
+++ b/monkey/infection_monkey/tunnel.py
@@ -5,11 +5,11 @@ import time
 from difflib import get_close_matches
 from threading import Thread
 
-from model import VictimHost
-from network.firewall import app as firewall
-from network.info import local_ips, get_free_tcp_port
-from network.tools import check_tcp_port
-from transport.base import get_last_serve_time
+from infection_monkey.model import VictimHost
+from infection_monkey.network.firewall import app as firewall
+from infection_monkey.network.info import local_ips, get_free_tcp_port
+from infection_monkey.network.tools import check_tcp_port
+from infection_monkey.transport.base import get_last_serve_time
 
 __author__ = 'hoffer'
 
diff --git a/monkey/infection_monkey/utils.py b/monkey/infection_monkey/utils.py
index e2f66bd03..664fcef44 100644
--- a/monkey/infection_monkey/utils.py
+++ b/monkey/infection_monkey/utils.py
@@ -2,7 +2,7 @@ import os
 import sys
 import struct
 
-from config import WormConfiguration
+from infection_monkey.config import WormConfiguration
 
 
 def get_monkey_log_path():
diff --git a/monkey/infection_monkey/windows_upgrader.py b/monkey/infection_monkey/windows_upgrader.py
index 4ee0462c5..67b1c3cbd 100644
--- a/monkey/infection_monkey/windows_upgrader.py
+++ b/monkey/infection_monkey/windows_upgrader.py
@@ -5,12 +5,12 @@ import shutil
 
 import time
 
-import monkeyfs
-from config import WormConfiguration
-from control import ControlClient
-from exploit.tools import build_monkey_commandline_explicitly
-from model import MONKEY_CMDLINE_WINDOWS
-from utils import is_windows_os, is_64bit_windows_os, is_64bit_python
+import infection_monkey.monkeyfs as monkeyfs
+from infection_monkey.config import WormConfiguration
+from infection_monkey.control import ControlClient
+from infection_monkey.exploit.tools import build_monkey_commandline_explicitly
+from infection_monkey.model import MONKEY_CMDLINE_WINDOWS
+from infection_monkey.utils import is_windows_os, is_64bit_windows_os, is_64bit_python
 
 __author__ = 'itay.mizeretz'