diff --git a/.gitignore b/.gitignore
index 403d090ad..44ae856a5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -62,9 +62,9 @@ docs/_build/
 
 # PyBuilder
 target/
-db
 bin
-/monkey_island/cc/server.key
-/monkey_island/cc/server.crt
-/monkey_island/cc/server.csr
-monkey_island/cc/ui/node_modules/
+/monkey/monkey_island/db
+/monkey/monkey_island/cc/server.key
+/monkey/monkey_island/cc/server.crt
+/monkey/monkey_island/cc/server.csr
+/monkey/monkey_island/cc/ui/node_modules/
diff --git a/infection_monkey/network/__init__.py b/infection_monkey/network/__init__.py
deleted file mode 100644
index fa15e357c..000000000
--- a/infection_monkey/network/__init__.py
+++ /dev/null
@@ -1,30 +0,0 @@
-from abc import ABCMeta, abstractmethod
-
-__author__ = 'itamar'
-
-
-class HostScanner(object):
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    def is_host_alive(self, host):
-        raise NotImplementedError()
-
-
-class HostFinger(object):
-    __metaclass__ = ABCMeta
-
-    @abstractmethod
-    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 mssql_fingerprint import MSSQLFinger
\ No newline at end of file
diff --git a/infection_monkey/transport/__init__.py b/infection_monkey/transport/__init__.py
deleted file mode 100644
index d0408a309..000000000
--- a/infection_monkey/transport/__init__.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from http import HTTPServer, LockedHTTPServer
-
-__author__ = 'hoffer'
diff --git a/common/__init__.py b/monkey/__init__.py
similarity index 100%
rename from common/__init__.py
rename to monkey/__init__.py
diff --git a/common/network/__init__.py b/monkey/common/__init__.py
similarity index 100%
rename from common/network/__init__.py
rename to monkey/common/__init__.py
diff --git a/monkey/common/network/__init__.py b/monkey/common/network/__init__.py
new file mode 100644
index 000000000..ee5b79ad0
--- /dev/null
+++ b/monkey/common/network/__init__.py
@@ -0,0 +1 @@
+__author__ = 'itay.mizeretz'
diff --git a/common/network/network_range.py b/monkey/common/network/network_range.py
similarity index 100%
rename from common/network/network_range.py
rename to monkey/common/network/network_range.py
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/__init__.py b/monkey/infection_monkey/__init__.py
new file mode 100644
index 000000000..ee5b79ad0
--- /dev/null
+++ b/monkey/infection_monkey/__init__.py
@@ -0,0 +1 @@
+__author__ = 'itay.mizeretz'
diff --git a/infection_monkey/build_linux.sh b/monkey/infection_monkey/build_linux.sh
similarity index 100%
rename from infection_monkey/build_linux.sh
rename to monkey/infection_monkey/build_linux.sh
diff --git a/infection_monkey/build_windows.bat b/monkey/infection_monkey/build_windows.bat
similarity index 100%
rename from infection_monkey/build_windows.bat
rename to monkey/infection_monkey/build_windows.bat
diff --git a/infection_monkey/config.py b/monkey/infection_monkey/config.py
similarity index 75%
rename from infection_monkey/config.py
rename to monkey/infection_monkey/config.py
index 4f7f4bcd9..4a63c082b 100644
--- a/infection_monkey/config.py
+++ b/monkey/infection_monkey/config.py
@@ -1,15 +1,13 @@
 import os
-import struct
+import json
 import sys
 import types
 import uuid
 from abc import ABCMeta
 from itertools import product
+import importlib
 
-from exploit import WmiExploiter, Ms08_067_Exploiter, SmbExploiter, RdpExploiter, SSHExploiter, ShellShockExploiter, \
-    SambaCryExploiter, ElasticGroovyExploiter, Struts2Exploiter, WebLogicExploiter, HadoopExploiter
-from network import TcpScanner, PingScanner, SMBFinger, SSHFinger, HTTPFinger, MySQLFinger, ElasticFinger, \
-    MSSQLFinger
+importlib.import_module('infection_monkey', 'network')
 
 __author__ = 'itamar'
 
@@ -18,57 +16,47 @@ GUID = str(uuid.getnode())
 EXTERNAL_CONFIG_FILE = os.path.join(os.path.abspath(os.path.dirname(sys.argv[0])), 'monkey.bin')
 
 
-def _cast_by_example(value, example):
-    """
-    a method that casts a value to the type of the parameter given as example
-    """
-    example_type = type(example)
-    if example_type is str:
-        return os.path.expandvars(value).encode("utf8")
-    elif example_type is tuple and len(example) != 0:
-        if value is None or value == tuple([None]):
-            return tuple()
-        return tuple([_cast_by_example(x, example[0]) for x in value])
-    elif example_type is list and len(example) != 0:
-        if value is None or value == [None]:
-            return []
-        return [_cast_by_example(x, example[0]) for x in value]
-    elif example_type is type(value):
-        return value
-    elif example_type is bool:
-        return value.lower() == 'true'
-    elif example_type is int:
-        return int(value)
-    elif example_type is float:
-        return float(value)
-    elif example_type in (type, ABCMeta):
-        return globals()[value]
-    else:
-        return None
-
-
 class Configuration(object):
-    def from_dict(self, data):
-        """
-        Get a dict of config variables, set known variables as attributes on self.
-        Return dict of unknown variables encountered.
-        """
-        unknown_variables = {}
-        for key, value in data.items():
+
+    def from_kv(self, formatted_data):
+        # now we won't work at <2.7 for sure
+        network_import = importlib.import_module('infection_monkey.network')
+        exploit_import = importlib.import_module('infection_monkey.exploit')
+
+        unknown_items = []
+        for key, value in formatted_data.items():
             if key.startswith('_'):
                 continue
             if key in ["name", "id", "current_server"]:
                 continue
             if self._depth_from_commandline and key == "depth":
                 continue
-            try:
-                default_value = getattr(Configuration, key)
-            except AttributeError:
-                unknown_variables[key] = value
-                continue
+            # handle in cases
+            if key == 'finger_classes':
+                class_objects = [getattr(network_import, val) for val in value]
+                setattr(self, key, class_objects)
+            elif key == 'scanner_class':
+                scanner_object = getattr(network_import, value)
+                setattr(self, key, scanner_object)
+            elif key == 'exploiter_classes':
+                class_objects = [getattr(exploit_import, val) for val in value]
+                setattr(self, key, class_objects)
+            else:
+                if hasattr(self, key):
+                    setattr(self, key, value)
+                else:
+                    unknown_items.append(key)
+        return unknown_items
 
-            setattr(self, key, _cast_by_example(value, default_value))
-        return unknown_variables
+    def from_json(self, json_data):
+        """
+        Gets a json data object, parses it and applies it to the configuration
+        :param json_data:
+        :return:
+        """
+        formatted_data = json.loads(json_data)
+        result = self.from_kv(formatted_data)
+        return result
 
     def as_dict(self):
         result = {}
@@ -145,12 +133,9 @@ class Configuration(object):
     # how many scan iterations to perform on each run
     max_iterations = 1
 
-    scanner_class = TcpScanner
-    finger_classes = [SMBFinger, SSHFinger, PingScanner, HTTPFinger, MySQLFinger, ElasticFinger, MSSQLFinger]
-    exploiter_classes = [SmbExploiter, WmiExploiter,  # Windows exploits
-                         SSHExploiter, ShellShockExploiter, SambaCryExploiter,  # Linux
-                         ElasticGroovyExploiter, Struts2Exploiter, WebLogicExploiter, HadoopExploiter  # multi
-                         ]
+    scanner_class = None
+    finger_classes = []
+    exploiter_classes = []
 
     # how many victims to look for in a single scan iteration
     victims_max_find = 30
diff --git a/infection_monkey/control.py b/monkey/infection_monkey/control.py
similarity index 96%
rename from infection_monkey/control.py
rename to monkey/infection_monkey/control.py
index d2cbc0cc0..7322322e7 100644
--- a/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'
 
@@ -160,7 +160,7 @@ class ControlClient(object):
             return
 
         try:
-            unknown_variables = WormConfiguration.from_dict(reply.json().get('config'))
+            unknown_variables = WormConfiguration.from_kv(reply.json().get('config'))
             LOG.info("New configuration was loaded from server: %r" % (WormConfiguration.as_dict(),))
         except Exception as exc:
             # we don't continue with default conf here because it might be dangerous
diff --git a/infection_monkey/dropper.py b/monkey/infection_monkey/dropper.py
similarity index 95%
rename from infection_monkey/dropper.py
rename to monkey/infection_monkey/dropper.py
index c135dcddb..02bd649c2 100644
--- a/infection_monkey/dropper.py
+++ b/monkey/infection_monkey/dropper.py
@@ -10,10 +10,10 @@ import time
 from ctypes import c_char_p
 
 import filecmp
-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/infection_monkey/example.conf b/monkey/infection_monkey/example.conf
similarity index 100%
rename from infection_monkey/example.conf
rename to monkey/infection_monkey/example.conf
diff --git a/infection_monkey/exploit/__init__.py b/monkey/infection_monkey/exploit/__init__.py
similarity index 55%
rename from infection_monkey/exploit/__init__.py
rename to monkey/infection_monkey/exploit/__init__.py
index d4456d20e..470155020 100644
--- a/infection_monkey/exploit/__init__.py
+++ b/monkey/infection_monkey/exploit/__init__.py
@@ -1,4 +1,5 @@
 from abc import ABCMeta, abstractmethod
+import infection_monkey.config
 
 __author__ = 'itamar'
 
@@ -9,7 +10,7 @@ class HostExploiter(object):
     _TARGET_OS_TYPE = []
 
     def __init__(self, host):
-
+        self._config = infection_monkey.config.WormConfiguration
         self._exploit_info = {}
         self._exploit_attempts = []
         self.host = host
@@ -18,7 +19,7 @@ class HostExploiter(object):
         return self.host.os.get('type') in self._TARGET_OS_TYPE
 
     def send_exploit_telemetry(self, result):
-        from control import ControlClient
+        from infection_monkey.control import ControlClient
         ControlClient.send_telemetry(
             'exploit',
             {'result': result, 'machine': self.host.__dict__, 'exploiter': self.__class__.__name__,
@@ -33,14 +34,14 @@ 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 struts2 import Struts2Exploiter
-from weblogic import WebLogicExploiter
-from hadoop import HadoopExploiter
+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
+from infection_monkey.exploit.struts2 import Struts2Exploiter
+from infection_monkey.exploit.weblogic import WebLogicExploiter
+from infection_monkey.exploit.hadoop import HadoopExploiter
diff --git a/infection_monkey/exploit/elasticgroovy.py b/monkey/infection_monkey/exploit/elasticgroovy.py
similarity index 92%
rename from infection_monkey/exploit/elasticgroovy.py
rename to monkey/infection_monkey/exploit/elasticgroovy.py
index c4cc3e4a7..9eb64682b 100644
--- a/infection_monkey/exploit/elasticgroovy.py
+++ b/monkey/infection_monkey/exploit/elasticgroovy.py
@@ -7,9 +7,9 @@
 import json
 import logging
 import requests
-from exploit.web_rce import WebRCE
-from model import WGET_HTTP_UPLOAD, RDP_CMDLINE_HTTP
-from network.elasticfinger import ES_PORT, ES_SERVICE
+from infection_monkey.exploit.web_rce import WebRCE
+from infection_monkey.model import WGET_HTTP_UPLOAD, RDP_CMDLINE_HTTP
+from infection_monkey.network.elasticfinger import ES_PORT, ES_SERVICE
 
 import re
 
diff --git a/infection_monkey/exploit/hadoop.py b/monkey/infection_monkey/exploit/hadoop.py
similarity index 94%
rename from infection_monkey/exploit/hadoop.py
rename to monkey/infection_monkey/exploit/hadoop.py
index c41badd52..0605614ee 100644
--- a/infection_monkey/exploit/hadoop.py
+++ b/monkey/infection_monkey/exploit/hadoop.py
@@ -8,10 +8,11 @@ import json
 import random
 import string
 import logging
-from exploit.web_rce import WebRCE
-from tools import HTTPTools, build_monkey_commandline, get_monkey_depth
 import posixpath
-from model import MONKEY_ARG, ID_STRING
+
+from infection_monkey.exploit.web_rce import WebRCE
+from infection_monkey.exploit.tools import HTTPTools, build_monkey_commandline, get_monkey_depth
+from infection_monkey.model import MONKEY_ARG, ID_STRING
 
 __author__ = 'VakarisZ'
 
diff --git a/infection_monkey/exploit/rdpgrinder.py b/monkey/infection_monkey/exploit/rdpgrinder.py
similarity index 96%
rename from infection_monkey/exploit/rdpgrinder.py
rename to monkey/infection_monkey/exploit/rdpgrinder.py
index 5d73c8279..3873a8ce3 100644
--- a/infection_monkey/exploit/rdpgrinder.py
+++ b/monkey/infection_monkey/exploit/rdpgrinder.py
@@ -9,12 +9,12 @@ 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
+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 +237,6 @@ class RdpExploiter(HostExploiter):
 
     def __init__(self, host):
         super(RdpExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
 
     def is_os_supported(self):
         if super(RdpExploiter, self).is_os_supported():
diff --git a/infection_monkey/exploit/sambacry.py b/monkey/infection_monkey/exploit/sambacry.py
similarity index 98%
rename from infection_monkey/exploit/sambacry.py
rename to monkey/infection_monkey/exploit/sambacry.py
index bddac84a1..f55b43553 100644
--- a/infection_monkey/exploit/sambacry.py
+++ b/monkey/infection_monkey/exploit/sambacry.py
@@ -15,12 +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_monkey_depth
-from pyinstaller_utils import get_binary_file_path
+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_monkey_depth
+from infection_monkey.pyinstaller_utils import get_binary_file_path
 
 __author__ = 'itay.mizeretz'
 
@@ -53,7 +53,6 @@ class SambaCryExploiter(HostExploiter):
 
     def __init__(self, host):
         super(SambaCryExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
 
     def exploit_host(self):
         if not self.is_vulnerable():
diff --git a/infection_monkey/exploit/shellshock.py b/monkey/infection_monkey/exploit/shellshock.py
similarity index 96%
rename from infection_monkey/exploit/shellshock.py
rename to monkey/infection_monkey/exploit/shellshock.py
index e1ef246b6..dd80af22c 100644
--- a/infection_monkey/exploit/shellshock.py
+++ b/monkey/infection_monkey/exploit/shellshock.py
@@ -6,11 +6,11 @@ from random import choice
 
 import requests
 
-from exploit import HostExploiter
-from exploit.tools import get_target_monkey, HTTPTools, get_monkey_depth
-from model import DROPPER_ARG
-from shellshock_resources import CGI_FILES
-from tools import build_monkey_commandline
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.exploit.tools import get_target_monkey, HTTPTools, get_monkey_depth
+from infection_monkey.model import DROPPER_ARG
+from infection_monkey.exploit.shellshock_resources import CGI_FILES
+from infection_monkey.exploit.tools import build_monkey_commandline
 
 __author__ = 'danielg'
 
@@ -29,7 +29,6 @@ class ShellShockExploiter(HostExploiter):
 
     def __init__(self, host):
         super(ShellShockExploiter, self).__init__(host)
-        self._config = __import__('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/infection_monkey/exploit/shellshock_resources.py b/monkey/infection_monkey/exploit/shellshock_resources.py
similarity index 100%
rename from infection_monkey/exploit/shellshock_resources.py
rename to monkey/infection_monkey/exploit/shellshock_resources.py
diff --git a/infection_monkey/exploit/smbexec.py b/monkey/infection_monkey/exploit/smbexec.py
similarity index 92%
rename from infection_monkey/exploit/smbexec.py
rename to monkey/infection_monkey/exploit/smbexec.py
index d3b27f79d..7528e08ba 100644
--- a/infection_monkey/exploit/smbexec.py
+++ b/monkey/infection_monkey/exploit/smbexec.py
@@ -3,12 +3,12 @@ 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
+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 +23,6 @@ class SmbExploiter(HostExploiter):
 
     def __init__(self, host):
         super(SmbExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
 
     def is_os_supported(self):
         if super(SmbExploiter, self).is_os_supported():
diff --git a/infection_monkey/exploit/sshexec.py b/monkey/infection_monkey/exploit/sshexec.py
similarity index 95%
rename from infection_monkey/exploit/sshexec.py
rename to monkey/infection_monkey/exploit/sshexec.py
index 7c6cc6509..82dd1f4d7 100644
--- a/infection_monkey/exploit/sshexec.py
+++ b/monkey/infection_monkey/exploit/sshexec.py
@@ -4,12 +4,12 @@ import time
 import paramiko
 import StringIO
 
-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
+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'
 
@@ -23,7 +23,6 @@ class SSHExploiter(HostExploiter):
 
     def __init__(self, host):
         super(SSHExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
         self._update_timestamp = 0
         self.skip_exist = self._config.skip_exploit_if_file_exist
 
diff --git a/infection_monkey/exploit/struts2.py b/monkey/infection_monkey/exploit/struts2.py
similarity index 98%
rename from infection_monkey/exploit/struts2.py
rename to monkey/infection_monkey/exploit/struts2.py
index fe4a73c09..18f3d3a7e 100644
--- a/infection_monkey/exploit/struts2.py
+++ b/monkey/infection_monkey/exploit/struts2.py
@@ -9,7 +9,7 @@ import unicodedata
 import re
 
 import logging
-from web_rce import WebRCE
+from infection_monkey.exploit.web_rce import WebRCE
 
 __author__ = "VakarisZ"
 
diff --git a/infection_monkey/exploit/tools.py b/monkey/infection_monkey/exploit/tools.py
similarity index 96%
rename from infection_monkey/exploit/tools.py
rename to monkey/infection_monkey/exploit/tools.py
index 7200688b6..a7a137557 100644
--- a/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, LockedHTTPServer
+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, LockedHTTPServer
 from threading import Lock
 
 
@@ -174,8 +175,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)
@@ -445,7 +445,7 @@ def get_interface_to_target(dst):
 
 
 def get_target_monkey(host):
-    from control import ControlClient
+    from infection_monkey.control import ControlClient
     import platform
     import sys
 
@@ -471,7 +471,7 @@ def get_target_monkey(host):
 
 
 def get_target_monkey_by_os(is_windows, is_32bit):
-    from control import ControlClient
+    from infection_monkey.control import ControlClient
     return ControlClient.download_monkey_exe_by_os(is_windows, is_32bit)
 
 
@@ -495,13 +495,13 @@ 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)
 
 
 def get_monkey_depth():
-    from config import WormConfiguration
+    from infection_monkey.config import WormConfiguration
     return WormConfiguration.depth
 
 
@@ -511,7 +511,7 @@ def get_monkey_dest_path(url_to_monkey):
     :param url_to_monkey: Hosted monkey's url. egz : http://localserver:9999/monkey/windows-32.exe
     :return: Corresponding monkey path from configuration
     """
-    from config import WormConfiguration
+    from infection_monkey.config import WormConfiguration
     if not url_to_monkey or ('linux' not in url_to_monkey and 'windows' not in url_to_monkey):
         LOG.error("Can't get destination path because source path %s is invalid.", url_to_monkey)
         return False
diff --git a/infection_monkey/exploit/web_rce.py b/monkey/infection_monkey/exploit/web_rce.py
similarity index 98%
rename from infection_monkey/exploit/web_rce.py
rename to monkey/infection_monkey/exploit/web_rce.py
index fe969c04c..a8dfd97c5 100644
--- a/infection_monkey/exploit/web_rce.py
+++ b/monkey/infection_monkey/exploit/web_rce.py
@@ -1,12 +1,12 @@
 import logging
-
-from exploit import HostExploiter
-from model import *
-from posixpath import join
 import re
+from posixpath import join
 from abc import abstractmethod
-from exploit.tools import get_target_monkey, get_monkey_depth, build_monkey_commandline, HTTPTools
-from network.tools import check_tcp_port, tcp_port_to_service
+
+from infection_monkey.exploit import HostExploiter
+from infection_monkey.model import *
+from infection_monkey.exploit.tools import get_target_monkey, get_monkey_depth, build_monkey_commandline, HTTPTools
+from infection_monkey.network.tools import check_tcp_port, tcp_port_to_service
 
 __author__ = 'VakarisZ'
 
diff --git a/infection_monkey/exploit/weblogic.py b/monkey/infection_monkey/exploit/weblogic.py
similarity index 98%
rename from infection_monkey/exploit/weblogic.py
rename to monkey/infection_monkey/exploit/weblogic.py
index 24e99424c..ac78555af 100644
--- a/infection_monkey/exploit/weblogic.py
+++ b/monkey/infection_monkey/exploit/weblogic.py
@@ -7,8 +7,8 @@
 # CVE: CVE-2017-10271
 
 from requests import post, exceptions
-from web_rce import WebRCE
-from exploit.tools import get_free_tcp_port, get_interface_to_target
+from infection_monkey.exploit.web_rce import WebRCE
+from infection_monkey.exploit.tools import get_free_tcp_port, get_interface_to_target
 from BaseHTTPServer import BaseHTTPRequestHandler, HTTPServer
 
 import threading
diff --git a/infection_monkey/exploit/win_ms08_067.py b/monkey/infection_monkey/exploit/win_ms08_067.py
similarity index 96%
rename from infection_monkey/exploit/win_ms08_067.py
rename to monkey/infection_monkey/exploit/win_ms08_067.py
index 85086bce7..9f8837157 100644
--- a/infection_monkey/exploit/win_ms08_067.py
+++ b/monkey/infection_monkey/exploit/win_ms08_067.py
@@ -14,11 +14,11 @@ 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
+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 +158,6 @@ 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
 
     def is_os_supported(self):
         if self.host.os.get('type') in self._TARGET_OS_TYPE and \
diff --git a/infection_monkey/exploit/wmiexec.py b/monkey/infection_monkey/exploit/wmiexec.py
similarity index 93%
rename from infection_monkey/exploit/wmiexec.py
rename to monkey/infection_monkey/exploit/wmiexec.py
index 0f9b2ee4c..1a8cb3386 100644
--- a/infection_monkey/exploit/wmiexec.py
+++ b/monkey/infection_monkey/exploit/wmiexec.py
@@ -5,10 +5,10 @@ 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
+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 +18,6 @@ class WmiExploiter(HostExploiter):
 
     def __init__(self, host):
         super(WmiExploiter, self).__init__(host)
-        self._config = __import__('config').WormConfiguration
-        self._guid = __import__('config').GUID
 
     @WmiTools.dcom_wrap
     def exploit_host(self):
diff --git a/infection_monkey/main.py b/monkey/infection_monkey/main.py
similarity index 92%
rename from infection_monkey/main.py
rename to monkey/infection_monkey/main.py
index 51fd6b9f7..be45afce4 100644
--- a/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
-from monkey import InfectionMonkey
-import utils
-
-if __name__ == "__main__":
-    sys.path.insert(0, os.path.dirname(os.path.abspath(__file__)))
+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
 
 __author__ = 'itamar'
 
@@ -63,7 +60,7 @@ def main():
         try:
             with open(config_file) as config_fo:
                 json_dict = json.load(config_fo)
-                WormConfiguration.from_dict(json_dict)
+                WormConfiguration.from_kv(json_dict)
         except ValueError as e:
             print("Error loading config: %s, using default" % (e,))
     else:
diff --git a/infection_monkey/model/__init__.py b/monkey/infection_monkey/model/__init__.py
similarity index 97%
rename from infection_monkey/model/__init__.py
rename to monkey/infection_monkey/model/__init__.py
index 4a8218a2e..f2217623a 100644
--- a/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/infection_monkey/model/host.py b/monkey/infection_monkey/model/host.py
similarity index 100%
rename from infection_monkey/model/host.py
rename to monkey/infection_monkey/model/host.py
diff --git a/infection_monkey/monkey-linux.spec b/monkey/infection_monkey/monkey-linux.spec
similarity index 93%
rename from infection_monkey/monkey-linux.spec
rename to monkey/infection_monkey/monkey-linux.spec
index fac69536e..61a2725c4 100644
--- a/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/infection_monkey/monkey.ico b/monkey/infection_monkey/monkey.ico
similarity index 100%
rename from infection_monkey/monkey.ico
rename to monkey/infection_monkey/monkey.ico
diff --git a/infection_monkey/monkey.py b/monkey/infection_monkey/monkey.py
similarity index 95%
rename from infection_monkey/monkey.py
rename to monkey/infection_monkey/monkey.py
index 8ad1baf8c..efdb43a3c 100644
--- a/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/infection_monkey/monkey.spec b/monkey/infection_monkey/monkey.spec
similarity index 97%
rename from infection_monkey/monkey.spec
rename to monkey/infection_monkey/monkey.spec
index b4449361b..f539d61fa 100644
--- a/infection_monkey/monkey.spec
+++ b/monkey/infection_monkey/monkey.spec
@@ -14,7 +14,7 @@ def get_mimikatz_zip_path():
 
 
 a = Analysis(['main.py'],
-             pathex=['.', '..'],
+             pathex=['..'],
              hiddenimports=['_cffi_backend', 'queue'],
              hookspath=None,
              runtime_hooks=None)
diff --git a/infection_monkey/monkey_utils/sambacry_monkey_runner/build.sh b/monkey/infection_monkey/monkey_utils/sambacry_monkey_runner/build.sh
similarity index 100%
rename from infection_monkey/monkey_utils/sambacry_monkey_runner/build.sh
rename to monkey/infection_monkey/monkey_utils/sambacry_monkey_runner/build.sh
diff --git a/infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.c b/monkey/infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.c
similarity index 100%
rename from infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.c
rename to monkey/infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.c
diff --git a/infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.h b/monkey/infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.h
similarity index 100%
rename from infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.h
rename to monkey/infection_monkey/monkey_utils/sambacry_monkey_runner/sc_monkey_runner.h
diff --git a/infection_monkey/monkeyfs.py b/monkey/infection_monkey/monkeyfs.py
similarity index 100%
rename from infection_monkey/monkeyfs.py
rename to monkey/infection_monkey/monkeyfs.py
diff --git a/monkey/infection_monkey/network/__init__.py b/monkey/infection_monkey/network/__init__.py
new file mode 100644
index 000000000..e43fa7073
--- /dev/null
+++ b/monkey/infection_monkey/network/__init__.py
@@ -0,0 +1,29 @@
+from abc import ABCMeta, abstractmethod
+
+__author__ = 'itamar'
+
+
+class HostScanner(object):
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def is_host_alive(self, host):
+        raise NotImplementedError()
+
+
+class HostFinger(object):
+    __metaclass__ = ABCMeta
+
+    @abstractmethod
+    def get_host_fingerprint(self, host):
+        raise NotImplementedError()
+
+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
+from infection_monkey.network.mssql_fingerprint import MSSQLFinger
\ No newline at end of file
diff --git a/infection_monkey/network/elasticfinger.py b/monkey/infection_monkey/network/elasticfinger.py
similarity index 88%
rename from infection_monkey/network/elasticfinger.py
rename to monkey/infection_monkey/network/elasticfinger.py
index 730decf4f..3d62de687 100644
--- a/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/infection_monkey/network/firewall.py b/monkey/infection_monkey/network/firewall.py
similarity index 100%
rename from infection_monkey/network/firewall.py
rename to monkey/infection_monkey/network/firewall.py
diff --git a/infection_monkey/network/httpfinger.py b/monkey/infection_monkey/network/httpfinger.py
similarity index 89%
rename from infection_monkey/network/httpfinger.py
rename to monkey/infection_monkey/network/httpfinger.py
index 437edbf6c..829c6b1b5 100644
--- a/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/infection_monkey/network/info.py b/monkey/infection_monkey/network/info.py
similarity index 100%
rename from infection_monkey/network/info.py
rename to monkey/infection_monkey/network/info.py
diff --git a/infection_monkey/network/mssql_fingerprint.py b/monkey/infection_monkey/network/mssql_fingerprint.py
similarity index 93%
rename from infection_monkey/network/mssql_fingerprint.py
rename to monkey/infection_monkey/network/mssql_fingerprint.py
index e34ed7a54..75fde7465 100644
--- a/infection_monkey/network/mssql_fingerprint.py
+++ b/monkey/infection_monkey/network/mssql_fingerprint.py
@@ -1,8 +1,9 @@
 import logging
 import socket
 
-from model.host import VictimHost
-from network import HostFinger
+from infection_monkey.model.host import VictimHost
+from infection_monkey.network import HostFinger
+import infection_monkey.config
 
 __author__ = 'Maor Rayzin'
 
@@ -18,7 +19,7 @@ class MSSQLFinger(HostFinger):
     SERVICE_NAME = 'MSSQL'
 
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
 
     def get_host_fingerprint(self, host):
         """Gets Microsoft SQL Server instance information by querying the SQL Browser service.
diff --git a/infection_monkey/network/mysqlfinger.py b/monkey/infection_monkey/network/mysqlfinger.py
similarity index 91%
rename from infection_monkey/network/mysqlfinger.py
rename to monkey/infection_monkey/network/mysqlfinger.py
index 39baa05ac..70080c12b 100644
--- a/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/infection_monkey/network/network_scanner.py b/monkey/infection_monkey/network/network_scanner.py
similarity index 85%
rename from infection_monkey/network/network_scanner.py
rename to monkey/infection_monkey/network/network_scanner.py
index 20133a9a7..2ccdfe74c 100644
--- a/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'
 
@@ -63,7 +63,15 @@ class NetworkScanner(object):
         return subnets_to_scan
 
     def get_victim_machines(self, scan_type, max_find=5, stop_callback=None):
-        assert issubclass(scan_type, HostScanner)
+        """
+        Finds machines according to the ranges specified in the object
+        :param scan_type: A hostscanner class, will be instanced and used to scan for new machines
+        :param max_find: Max number of victims to find regardless of ranges
+        :param stop_callback: A callback to check at any point if we should stop scanning
+        :return: yields a sequence of VictimHost instances
+        """
+        if not scan_type:
+            return
 
         scanner = scan_type()
         victims_count = 0
diff --git a/infection_monkey/network/ping_scanner.py b/monkey/infection_monkey/network/ping_scanner.py
similarity index 91%
rename from infection_monkey/network/ping_scanner.py
rename to monkey/infection_monkey/network/ping_scanner.py
index 7162c36f3..075b57669 100644
--- a/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/infection_monkey/network/smbfinger.py b/monkey/infection_monkey/network/smbfinger.py
similarity index 96%
rename from infection_monkey/network/smbfinger.py
rename to monkey/infection_monkey/network/smbfinger.py
index 9ccb52422..ab92f2761 100644
--- a/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/infection_monkey/network/sshfinger.py b/monkey/infection_monkey/network/sshfinger.py
similarity index 85%
rename from infection_monkey/network/sshfinger.py
rename to monkey/infection_monkey/network/sshfinger.py
index 89c3092d7..21deb8814 100644
--- a/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/infection_monkey/network/tcp_scanner.py b/monkey/infection_monkey/network/tcp_scanner.py
similarity index 85%
rename from infection_monkey/network/tcp_scanner.py
rename to monkey/infection_monkey/network/tcp_scanner.py
index 625173e97..d864e3e73 100644
--- a/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, tcp_port_to_service
+import infection_monkey.config
+from infection_monkey.network import HostScanner, HostFinger
+from infection_monkey.network.tools import check_tcp_ports, tcp_port_to_service
 
 __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/infection_monkey/network/tools.py b/monkey/infection_monkey/network/tools.py
similarity index 100%
rename from infection_monkey/network/tools.py
rename to monkey/infection_monkey/network/tools.py
diff --git a/infection_monkey/pyinstaller_utils.py b/monkey/infection_monkey/pyinstaller_utils.py
similarity index 100%
rename from infection_monkey/pyinstaller_utils.py
rename to monkey/infection_monkey/pyinstaller_utils.py
diff --git a/infection_monkey/readme.txt b/monkey/infection_monkey/readme.txt
similarity index 100%
rename from infection_monkey/readme.txt
rename to monkey/infection_monkey/readme.txt
diff --git a/infection_monkey/requirements.txt b/monkey/infection_monkey/requirements.txt
similarity index 100%
rename from infection_monkey/requirements.txt
rename to monkey/infection_monkey/requirements.txt
diff --git a/infection_monkey/system_info/SSH_info_collector.py b/monkey/infection_monkey/system_info/SSH_info_collector.py
similarity index 100%
rename from infection_monkey/system_info/SSH_info_collector.py
rename to monkey/infection_monkey/system_info/SSH_info_collector.py
diff --git a/infection_monkey/system_info/__init__.py b/monkey/infection_monkey/system_info/__init__.py
similarity index 95%
rename from infection_monkey/system_info/__init__.py
rename to monkey/infection_monkey/system_info/__init__.py
index 667ff9890..fbfbcbd7a 100644
--- a/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/infection_monkey/system_info/azure_cred_collector.py b/monkey/infection_monkey/system_info/azure_cred_collector.py
similarity index 100%
rename from infection_monkey/system_info/azure_cred_collector.py
rename to monkey/infection_monkey/system_info/azure_cred_collector.py
diff --git a/infection_monkey/system_info/linux_info_collector.py b/monkey/infection_monkey/system_info/linux_info_collector.py
similarity index 84%
rename from infection_monkey/system_info/linux_info_collector.py
rename to monkey/infection_monkey/system_info/linux_info_collector.py
index d80efff6a..466177b49 100644
--- a/infection_monkey/system_info/linux_info_collector.py
+++ b/monkey/infection_monkey/system_info/linux_info_collector.py
@@ -1,7 +1,7 @@
 import logging
 
-from . import InfoCollector
-from SSH_info_collector import SSHCollector
+from infection_monkey.system_info import InfoCollector
+from infection_monkey.system_info.SSH_info_collector import SSHCollector
 
 __author__ = 'uri'
 
diff --git a/infection_monkey/system_info/mimikatz_collector.py b/monkey/infection_monkey/system_info/mimikatz_collector.py
similarity index 95%
rename from infection_monkey/system_info/mimikatz_collector.py
rename to monkey/infection_monkey/system_info/mimikatz_collector.py
index 365a00648..66118f27f 100644
--- a/infection_monkey/system_info/mimikatz_collector.py
+++ b/monkey/infection_monkey/system_info/mimikatz_collector.py
@@ -4,7 +4,9 @@ import logging
 import socket
 import zipfile
 
-from pyinstaller_utils import get_binary_file_path, get_binaries_dir_path
+import infection_monkey.config
+
+from infection_monkey.pyinstaller_utils import get_binary_file_path, get_binaries_dir_path
 
 __author__ = 'itay.mizeretz'
 
@@ -26,7 +28,7 @@ class MimikatzCollector(object):
     MIMIKATZ_ZIP_PASSWORD = r'VTQpsJPXgZuXhX6x3V84G'
 
     def __init__(self):
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
         self._isInit = False
         self._dll = None
         self._collect = None
diff --git a/infection_monkey/system_info/windows_info_collector.py b/monkey/infection_monkey/system_info/windows_info_collector.py
similarity index 81%
rename from infection_monkey/system_info/windows_info_collector.py
rename to monkey/infection_monkey/system_info/windows_info_collector.py
index b3657f0f0..da4867809 100644
--- a/infection_monkey/system_info/windows_info_collector.py
+++ b/monkey/infection_monkey/system_info/windows_info_collector.py
@@ -1,7 +1,8 @@
 import logging
 
-from mimikatz_collector import MimikatzCollector
-from . import InfoCollector
+import infection_monkey.config
+from infection_monkey.system_info.mimikatz_collector import MimikatzCollector
+from infection_monkey.system_info import InfoCollector
 
 LOG = logging.getLogger(__name__)
 
@@ -15,7 +16,7 @@ class WindowsInfoCollector(InfoCollector):
 
     def __init__(self):
         super(WindowsInfoCollector, self).__init__()
-        self._config = __import__('config').WormConfiguration
+        self._config = infection_monkey.config.WormConfiguration
 
     def get_info(self):
         """
diff --git a/infection_monkey/system_singleton.py b/monkey/infection_monkey/system_singleton.py
similarity index 98%
rename from infection_monkey/system_singleton.py
rename to monkey/infection_monkey/system_singleton.py
index 970905a9c..9f56c238e 100644
--- a/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/transport/__init__.py b/monkey/infection_monkey/transport/__init__.py
new file mode 100644
index 000000000..735ef670a
--- /dev/null
+++ b/monkey/infection_monkey/transport/__init__.py
@@ -0,0 +1,4 @@
+from infection_monkey.transport.http import HTTPServer, LockedHTTPServer
+
+
+__author__ = 'hoffer'
diff --git a/infection_monkey/transport/base.py b/monkey/infection_monkey/transport/base.py
similarity index 96%
rename from infection_monkey/transport/base.py
rename to monkey/infection_monkey/transport/base.py
index dae0ff072..e6a5bc366 100644
--- a/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/infection_monkey/transport/http.py b/monkey/infection_monkey/transport/http.py
similarity index 98%
rename from infection_monkey/transport/http.py
rename to monkey/infection_monkey/transport/http.py
index b65fda4e9..00ced7198 100644
--- a/infection_monkey/transport/http.py
+++ b/monkey/infection_monkey/transport/http.py
@@ -8,8 +8,8 @@ from logging import getLogger
 from urlparse import urlsplit
 from threading import Lock
 
-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/infection_monkey/transport/tcp.py b/monkey/infection_monkey/transport/tcp.py
similarity index 96%
rename from infection_monkey/transport/tcp.py
rename to monkey/infection_monkey/transport/tcp.py
index eaa94de1c..e910e657f 100644
--- a/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/infection_monkey/tunnel.py b/monkey/infection_monkey/tunnel.py
similarity index 95%
rename from infection_monkey/tunnel.py
rename to monkey/infection_monkey/tunnel.py
index 9a50679ff..d589ac98b 100644
--- a/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/infection_monkey/utils.py b/monkey/infection_monkey/utils.py
similarity index 92%
rename from infection_monkey/utils.py
rename to monkey/infection_monkey/utils.py
index b39cd44f5..3f04ed9fb 100644
--- a/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/infection_monkey/windows_upgrader.py b/monkey/infection_monkey/windows_upgrader.py
similarity index 82%
rename from infection_monkey/windows_upgrader.py
rename to monkey/infection_monkey/windows_upgrader.py
index 4ee0462c5..67b1c3cbd 100644
--- a/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'
 
diff --git a/monkey/monkey_island.py b/monkey/monkey_island.py
new file mode 100644
index 000000000..104b5efdf
--- /dev/null
+++ b/monkey/monkey_island.py
@@ -0,0 +1,4 @@
+import monkey_island.cc.main
+
+if "__main__" == __name__:
+    monkey_island.cc.main.main()
diff --git a/monkey/monkey_island/__init__.py b/monkey/monkey_island/__init__.py
new file mode 100644
index 000000000..ee5b79ad0
--- /dev/null
+++ b/monkey/monkey_island/__init__.py
@@ -0,0 +1 @@
+__author__ = 'itay.mizeretz'
diff --git a/monkey_island/cc/__init__.py b/monkey/monkey_island/cc/__init__.py
similarity index 100%
rename from monkey_island/cc/__init__.py
rename to monkey/monkey_island/cc/__init__.py
diff --git a/monkey_island/cc/app.py b/monkey/monkey_island/cc/app.py
similarity index 89%
rename from monkey_island/cc/app.py
rename to monkey/monkey_island/cc/app.py
index 6b9ac1154..f5823ef88 100644
--- a/monkey_island/cc/app.py
+++ b/monkey/monkey_island/cc/app.py
@@ -4,7 +4,7 @@ from datetime import datetime
 import bson
 import flask_restful
 from bson.json_util import dumps
-from flask import Flask, send_from_directory, make_response
+from flask import Flask, send_from_directory, make_response, Response
 from werkzeug.exceptions import NotFound
 
 from cc.auth import init_jwt
@@ -29,18 +29,24 @@ from cc.services.config import ConfigService
 __author__ = 'Barak'
 
 
+HOME_FILE = 'index.html'
+
+
 def serve_static_file(static_path):
     if static_path.startswith('api/'):
         raise NotFound()
     try:
-        return send_from_directory('ui/dist', static_path)
+        return send_from_directory(os.path.join(os.getcwd(), 'monkey_island/cc/ui/dist'), static_path)
     except NotFound:
         # Because react uses various urls for same index page, this is probably the user's intention.
+        if static_path == HOME_FILE:
+            flask_restful.abort(
+                Response("Page not found. Make sure you ran the npm script and the cwd is monkey\\monkey.", 500))
         return serve_home()
 
 
 def serve_home():
-    return serve_static_file('index.html')
+    return serve_static_file(HOME_FILE)
 
 
 def normalize_obj(obj):
diff --git a/monkey_island/cc/auth.py b/monkey/monkey_island/cc/auth.py
similarity index 100%
rename from monkey_island/cc/auth.py
rename to monkey/monkey_island/cc/auth.py
diff --git a/monkey_island/cc/binaries/.gitignore b/monkey/monkey_island/cc/binaries/.gitignore
similarity index 100%
rename from monkey_island/cc/binaries/.gitignore
rename to monkey/monkey_island/cc/binaries/.gitignore
diff --git a/monkey_island/cc/database.py b/monkey/monkey_island/cc/database.py
similarity index 100%
rename from monkey_island/cc/database.py
rename to monkey/monkey_island/cc/database.py
diff --git a/monkey_island/cc/encryptor.py b/monkey/monkey_island/cc/encryptor.py
similarity index 96%
rename from monkey_island/cc/encryptor.py
rename to monkey/monkey_island/cc/encryptor.py
index 90009d1b0..3a3d052f6 100644
--- a/monkey_island/cc/encryptor.py
+++ b/monkey/monkey_island/cc/encryptor.py
@@ -9,7 +9,7 @@ __author__ = "itay.mizeretz"
 
 class Encryptor:
     _BLOCK_SIZE = 32
-    _DB_PASSWORD_FILENAME = "mongo_key.bin"
+    _DB_PASSWORD_FILENAME = "monkey_island/cc/mongo_key.bin"
 
     def __init__(self):
         self._load_key()
diff --git a/monkey_island/cc/environment/__init__.py b/monkey/monkey_island/cc/environment/__init__.py
similarity index 100%
rename from monkey_island/cc/environment/__init__.py
rename to monkey/monkey_island/cc/environment/__init__.py
diff --git a/monkey_island/cc/environment/aws.py b/monkey/monkey_island/cc/environment/aws.py
similarity index 100%
rename from monkey_island/cc/environment/aws.py
rename to monkey/monkey_island/cc/environment/aws.py
diff --git a/monkey_island/cc/environment/environment.py b/monkey/monkey_island/cc/environment/environment.py
similarity index 90%
rename from monkey_island/cc/environment/environment.py
rename to monkey/monkey_island/cc/environment/environment.py
index 094b9c235..9e89208ef 100644
--- a/monkey_island/cc/environment/environment.py
+++ b/monkey/monkey_island/cc/environment/environment.py
@@ -13,7 +13,7 @@ ENV_DICT = {
 
 
 def load_env_from_file():
-    with open('server_config.json', 'r') as f:
+    with open('monkey_island/cc/server_config.json', 'r') as f:
         config_content = f.read()
     config_json = json.loads(config_content)
     return config_json['server_config']
diff --git a/monkey_island/cc/environment/standard.py b/monkey/monkey_island/cc/environment/standard.py
similarity index 100%
rename from monkey_island/cc/environment/standard.py
rename to monkey/monkey_island/cc/environment/standard.py
diff --git a/monkey_island/cc/island_logger.py b/monkey/monkey_island/cc/island_logger.py
similarity index 100%
rename from monkey_island/cc/island_logger.py
rename to monkey/monkey_island/cc/island_logger.py
diff --git a/monkey_island/cc/island_logger_default_config.json b/monkey/monkey_island/cc/island_logger_default_config.json
similarity index 100%
rename from monkey_island/cc/island_logger_default_config.json
rename to monkey/monkey_island/cc/island_logger_default_config.json
diff --git a/monkey_island/cc/main.py b/monkey/monkey_island/cc/main.py
similarity index 84%
rename from monkey_island/cc/main.py
rename to monkey/monkey_island/cc/main.py
index 74450cb29..a86d13913 100644
--- a/monkey_island/cc/main.py
+++ b/monkey/monkey_island/cc/main.py
@@ -6,10 +6,6 @@ import time
 import logging
 
 BASE_PATH = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
-PARENT_PATH = os.path.dirname(BASE_PATH)
-
-if PARENT_PATH not in sys.path:
-    sys.path.insert(0, PARENT_PATH)
 
 if BASE_PATH not in sys.path:
     sys.path.insert(0, BASE_PATH)
@@ -38,11 +34,11 @@ def main():
 
     app = init_app(mongo_url)
     if env.is_debug():
-        app.run(host='0.0.0.0', debug=True, ssl_context=('server.crt', 'server.key'))
+        app.run(host='0.0.0.0', debug=True, ssl_context=('monkey_island/cc/server.crt', 'monkey_island/cc/server.key'))
     else:
         http_server = HTTPServer(WSGIContainer(app),
-                                 ssl_options={'certfile': os.environ.get('SERVER_CRT', 'server.crt'),
-                                              'keyfile': os.environ.get('SERVER_KEY', 'server.key')})
+                                 ssl_options={'certfile': os.environ.get('SERVER_CRT', 'monkey_island/cc/server.crt'),
+                                              'keyfile': os.environ.get('SERVER_KEY', 'monkey_island/cc/server.key')})
         http_server.listen(env.get_island_port())
         logger.info(
             'Monkey Island Server is running on https://{}:{}'.format(local_ip_addresses()[0], env.get_island_port()))
diff --git a/monkey_island/cc/resources/__init__.py b/monkey/monkey_island/cc/resources/__init__.py
similarity index 100%
rename from monkey_island/cc/resources/__init__.py
rename to monkey/monkey_island/cc/resources/__init__.py
diff --git a/monkey_island/cc/resources/client_run.py b/monkey/monkey_island/cc/resources/client_run.py
similarity index 100%
rename from monkey_island/cc/resources/client_run.py
rename to monkey/monkey_island/cc/resources/client_run.py
diff --git a/monkey_island/cc/resources/edge.py b/monkey/monkey_island/cc/resources/edge.py
similarity index 100%
rename from monkey_island/cc/resources/edge.py
rename to monkey/monkey_island/cc/resources/edge.py
diff --git a/monkey_island/cc/resources/island_logs.py b/monkey/monkey_island/cc/resources/island_logs.py
similarity index 100%
rename from monkey_island/cc/resources/island_logs.py
rename to monkey/monkey_island/cc/resources/island_logs.py
diff --git a/monkey_island/cc/resources/local_run.py b/monkey/monkey_island/cc/resources/local_run.py
similarity index 92%
rename from monkey_island/cc/resources/local_run.py
rename to monkey/monkey_island/cc/resources/local_run.py
index 7b8965e1e..6e7d44cb9 100644
--- a/monkey_island/cc/resources/local_run.py
+++ b/monkey/monkey_island/cc/resources/local_run.py
@@ -26,8 +26,8 @@ def run_local_monkey():
     if not result:
         return False, "OS Type not found"
 
-    monkey_path = os.path.join('binaries', result['filename'])
-    target_path = os.path.join(os.getcwd(), result['filename'])
+    monkey_path = os.path.join(os.getcwd(), 'monkey_island', 'cc', 'binaries', result['filename'])
+    target_path = os.path.join(os.getcwd(), 'monkey_island', result['filename'])
 
     # copy the executable to temp path (don't run the monkey from its current location as it may delete itself)
     try:
diff --git a/monkey_island/cc/resources/log.py b/monkey/monkey_island/cc/resources/log.py
similarity index 100%
rename from monkey_island/cc/resources/log.py
rename to monkey/monkey_island/cc/resources/log.py
diff --git a/monkey_island/cc/resources/monkey.py b/monkey/monkey_island/cc/resources/monkey.py
similarity index 100%
rename from monkey_island/cc/resources/monkey.py
rename to monkey/monkey_island/cc/resources/monkey.py
diff --git a/monkey_island/cc/resources/monkey_configuration.py b/monkey/monkey_island/cc/resources/monkey_configuration.py
similarity index 100%
rename from monkey_island/cc/resources/monkey_configuration.py
rename to monkey/monkey_island/cc/resources/monkey_configuration.py
diff --git a/monkey_island/cc/resources/monkey_download.py b/monkey/monkey_island/cc/resources/monkey_download.py
similarity index 100%
rename from monkey_island/cc/resources/monkey_download.py
rename to monkey/monkey_island/cc/resources/monkey_download.py
diff --git a/monkey_island/cc/resources/netmap.py b/monkey/monkey_island/cc/resources/netmap.py
similarity index 100%
rename from monkey_island/cc/resources/netmap.py
rename to monkey/monkey_island/cc/resources/netmap.py
diff --git a/monkey_island/cc/resources/node.py b/monkey/monkey_island/cc/resources/node.py
similarity index 100%
rename from monkey_island/cc/resources/node.py
rename to monkey/monkey_island/cc/resources/node.py
diff --git a/monkey_island/cc/resources/report.py b/monkey/monkey_island/cc/resources/report.py
similarity index 100%
rename from monkey_island/cc/resources/report.py
rename to monkey/monkey_island/cc/resources/report.py
diff --git a/monkey_island/cc/resources/root.py b/monkey/monkey_island/cc/resources/root.py
similarity index 100%
rename from monkey_island/cc/resources/root.py
rename to monkey/monkey_island/cc/resources/root.py
diff --git a/monkey_island/cc/resources/telemetry.py b/monkey/monkey_island/cc/resources/telemetry.py
similarity index 100%
rename from monkey_island/cc/resources/telemetry.py
rename to monkey/monkey_island/cc/resources/telemetry.py
diff --git a/monkey_island/cc/resources/telemetry_feed.py b/monkey/monkey_island/cc/resources/telemetry_feed.py
similarity index 100%
rename from monkey_island/cc/resources/telemetry_feed.py
rename to monkey/monkey_island/cc/resources/telemetry_feed.py
diff --git a/monkey_island/cc/server_config.json b/monkey/monkey_island/cc/server_config.json
similarity index 100%
rename from monkey_island/cc/server_config.json
rename to monkey/monkey_island/cc/server_config.json
diff --git a/monkey_island/cc/services/__init__.py b/monkey/monkey_island/cc/services/__init__.py
similarity index 100%
rename from monkey_island/cc/services/__init__.py
rename to monkey/monkey_island/cc/services/__init__.py
diff --git a/monkey_island/cc/services/config.py b/monkey/monkey_island/cc/services/config.py
similarity index 100%
rename from monkey_island/cc/services/config.py
rename to monkey/monkey_island/cc/services/config.py
diff --git a/monkey_island/cc/services/edge.py b/monkey/monkey_island/cc/services/edge.py
similarity index 100%
rename from monkey_island/cc/services/edge.py
rename to monkey/monkey_island/cc/services/edge.py
diff --git a/monkey_island/cc/services/island_logs.py b/monkey/monkey_island/cc/services/island_logs.py
similarity index 100%
rename from monkey_island/cc/services/island_logs.py
rename to monkey/monkey_island/cc/services/island_logs.py
diff --git a/monkey_island/cc/services/log.py b/monkey/monkey_island/cc/services/log.py
similarity index 100%
rename from monkey_island/cc/services/log.py
rename to monkey/monkey_island/cc/services/log.py
diff --git a/monkey_island/cc/services/node.py b/monkey/monkey_island/cc/services/node.py
similarity index 100%
rename from monkey_island/cc/services/node.py
rename to monkey/monkey_island/cc/services/node.py
diff --git a/monkey_island/cc/services/report.py b/monkey/monkey_island/cc/services/report.py
similarity index 100%
rename from monkey_island/cc/services/report.py
rename to monkey/monkey_island/cc/services/report.py
diff --git a/monkey_island/cc/ui/.babelrc b/monkey/monkey_island/cc/ui/.babelrc
similarity index 100%
rename from monkey_island/cc/ui/.babelrc
rename to monkey/monkey_island/cc/ui/.babelrc
diff --git a/monkey_island/cc/ui/.editorconfig b/monkey/monkey_island/cc/ui/.editorconfig
similarity index 100%
rename from monkey_island/cc/ui/.editorconfig
rename to monkey/monkey_island/cc/ui/.editorconfig
diff --git a/monkey_island/cc/ui/.eslintrc b/monkey/monkey_island/cc/ui/.eslintrc
similarity index 100%
rename from monkey_island/cc/ui/.eslintrc
rename to monkey/monkey_island/cc/ui/.eslintrc
diff --git a/monkey_island/cc/ui/.gitignore b/monkey/monkey_island/cc/ui/.gitignore
similarity index 100%
rename from monkey_island/cc/ui/.gitignore
rename to monkey/monkey_island/cc/ui/.gitignore
diff --git a/monkey_island/cc/ui/.yo-rc.json b/monkey/monkey_island/cc/ui/.yo-rc.json
similarity index 100%
rename from monkey_island/cc/ui/.yo-rc.json
rename to monkey/monkey_island/cc/ui/.yo-rc.json
diff --git a/monkey_island/cc/ui/karma.conf.js b/monkey/monkey_island/cc/ui/karma.conf.js
similarity index 100%
rename from monkey_island/cc/ui/karma.conf.js
rename to monkey/monkey_island/cc/ui/karma.conf.js
diff --git a/monkey_island/cc/ui/package-lock.json b/monkey/monkey_island/cc/ui/package-lock.json
similarity index 100%
rename from monkey_island/cc/ui/package-lock.json
rename to monkey/monkey_island/cc/ui/package-lock.json
diff --git a/monkey_island/cc/ui/package.json b/monkey/monkey_island/cc/ui/package.json
similarity index 100%
rename from monkey_island/cc/ui/package.json
rename to monkey/monkey_island/cc/ui/package.json
diff --git a/monkey_island/cc/ui/server.js b/monkey/monkey_island/cc/ui/server.js
similarity index 100%
rename from monkey_island/cc/ui/server.js
rename to monkey/monkey_island/cc/ui/server.js
diff --git a/monkey_island/cc/ui/src/components/AuthComponent.js b/monkey/monkey_island/cc/ui/src/components/AuthComponent.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/AuthComponent.js
rename to monkey/monkey_island/cc/ui/src/components/AuthComponent.js
diff --git a/monkey_island/cc/ui/src/components/Main.js b/monkey/monkey_island/cc/ui/src/components/Main.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/Main.js
rename to monkey/monkey_island/cc/ui/src/components/Main.js
diff --git a/monkey_island/cc/ui/src/components/map/MapOptions.js b/monkey/monkey_island/cc/ui/src/components/map/MapOptions.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/map/MapOptions.js
rename to monkey/monkey_island/cc/ui/src/components/map/MapOptions.js
diff --git a/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js b/monkey/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
rename to monkey/monkey_island/cc/ui/src/components/map/preview-pane/PreviewPane.js
diff --git a/monkey_island/cc/ui/src/components/pages/ConfigurePage.js b/monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/ConfigurePage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/ConfigurePage.js
diff --git a/monkey_island/cc/ui/src/components/pages/LicensePage.js b/monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/LicensePage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/LicensePage.js
diff --git a/monkey_island/cc/ui/src/components/pages/LoginPage.js b/monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/LoginPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/LoginPage.js
diff --git a/monkey_island/cc/ui/src/components/pages/MapPage.js b/monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/MapPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/MapPage.js
diff --git a/monkey_island/cc/ui/src/components/pages/ReportPage.js b/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
similarity index 99%
rename from monkey_island/cc/ui/src/components/pages/ReportPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
index c592464f0..98ecb4a42 100644
--- a/monkey_island/cc/ui/src/components/pages/ReportPage.js
+++ b/monkey/monkey_island/cc/ui/src/components/pages/ReportPage.js
@@ -810,7 +810,7 @@ class ReportPageComponent extends AuthComponent {
         data = this.generateConfickerIssue(issue);
         break;
       case 'island_cross_segment':
-        data = this.generateCrossSegmentIssue(issue);
+        data = this.generateIslandCrossSegmentIssue(issue);
         break;
       case 'tunnel':
         data = this.generateTunnelIssue(issue);
diff --git a/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/RunMonkeyPage.js
diff --git a/monkey_island/cc/ui/src/components/pages/RunServerPage.js b/monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/RunServerPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/RunServerPage.js
diff --git a/monkey_island/cc/ui/src/components/pages/StartOverPage.js b/monkey/monkey_island/cc/ui/src/components/pages/StartOverPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/StartOverPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/StartOverPage.js
diff --git a/monkey_island/cc/ui/src/components/pages/TelemetryPage.js b/monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/pages/TelemetryPage.js
rename to monkey/monkey_island/cc/ui/src/components/pages/TelemetryPage.js
diff --git a/monkey_island/cc/ui/src/components/reactive-graph/ReactiveGraph.js b/monkey/monkey_island/cc/ui/src/components/reactive-graph/ReactiveGraph.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/reactive-graph/ReactiveGraph.js
rename to monkey/monkey_island/cc/ui/src/components/reactive-graph/ReactiveGraph.js
diff --git a/monkey_island/cc/ui/src/components/report-components/BreachedServers.js b/monkey/monkey_island/cc/ui/src/components/report-components/BreachedServers.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/report-components/BreachedServers.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/BreachedServers.js
diff --git a/monkey_island/cc/ui/src/components/report-components/CollapsibleWell.js b/monkey/monkey_island/cc/ui/src/components/report-components/CollapsibleWell.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/report-components/CollapsibleWell.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/CollapsibleWell.js
diff --git a/monkey_island/cc/ui/src/components/report-components/ScannedServers.js b/monkey/monkey_island/cc/ui/src/components/report-components/ScannedServers.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/report-components/ScannedServers.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/ScannedServers.js
diff --git a/monkey_island/cc/ui/src/components/report-components/StolenPasswords.js b/monkey/monkey_island/cc/ui/src/components/report-components/StolenPasswords.js
similarity index 100%
rename from monkey_island/cc/ui/src/components/report-components/StolenPasswords.js
rename to monkey/monkey_island/cc/ui/src/components/report-components/StolenPasswords.js
diff --git a/monkey_island/cc/ui/src/config/README.md b/monkey/monkey_island/cc/ui/src/config/README.md
similarity index 100%
rename from monkey_island/cc/ui/src/config/README.md
rename to monkey/monkey_island/cc/ui/src/config/README.md
diff --git a/monkey_island/cc/ui/src/config/base.js b/monkey/monkey_island/cc/ui/src/config/base.js
similarity index 100%
rename from monkey_island/cc/ui/src/config/base.js
rename to monkey/monkey_island/cc/ui/src/config/base.js
diff --git a/monkey_island/cc/ui/src/config/dev.js b/monkey/monkey_island/cc/ui/src/config/dev.js
similarity index 100%
rename from monkey_island/cc/ui/src/config/dev.js
rename to monkey/monkey_island/cc/ui/src/config/dev.js
diff --git a/monkey_island/cc/ui/src/config/dist.js b/monkey/monkey_island/cc/ui/src/config/dist.js
similarity index 100%
rename from monkey_island/cc/ui/src/config/dist.js
rename to monkey/monkey_island/cc/ui/src/config/dist.js
diff --git a/monkey_island/cc/ui/src/config/test.js b/monkey/monkey_island/cc/ui/src/config/test.js
similarity index 100%
rename from monkey_island/cc/ui/src/config/test.js
rename to monkey/monkey_island/cc/ui/src/config/test.js
diff --git a/monkey_island/cc/ui/src/favicon.ico b/monkey/monkey_island/cc/ui/src/favicon.ico
similarity index 100%
rename from monkey_island/cc/ui/src/favicon.ico
rename to monkey/monkey_island/cc/ui/src/favicon.ico
diff --git a/monkey_island/cc/ui/src/images/guardicore-logo.png b/monkey/monkey_island/cc/ui/src/images/guardicore-logo.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/guardicore-logo.png
rename to monkey/monkey_island/cc/ui/src/images/guardicore-logo.png
diff --git a/monkey_island/cc/ui/src/images/infection-monkey.svg b/monkey/monkey_island/cc/ui/src/images/infection-monkey.svg
similarity index 100%
rename from monkey_island/cc/ui/src/images/infection-monkey.svg
rename to monkey/monkey_island/cc/ui/src/images/infection-monkey.svg
diff --git a/monkey_island/cc/ui/src/images/monkey-icon.svg b/monkey/monkey_island/cc/ui/src/images/monkey-icon.svg
similarity index 100%
rename from monkey_island/cc/ui/src/images/monkey-icon.svg
rename to monkey/monkey_island/cc/ui/src/images/monkey-icon.svg
diff --git a/monkey_island/cc/ui/src/images/nodes/clean_linux.png b/monkey/monkey_island/cc/ui/src/images/nodes/clean_linux.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/clean_linux.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/clean_linux.png
diff --git a/monkey_island/cc/ui/src/images/nodes/clean_unknown.png b/monkey/monkey_island/cc/ui/src/images/nodes/clean_unknown.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/clean_unknown.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/clean_unknown.png
diff --git a/monkey_island/cc/ui/src/images/nodes/clean_windows.png b/monkey/monkey_island/cc/ui/src/images/nodes/clean_windows.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/clean_windows.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/clean_windows.png
diff --git a/monkey_island/cc/ui/src/images/nodes/exploited_linux.png b/monkey/monkey_island/cc/ui/src/images/nodes/exploited_linux.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/exploited_linux.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/exploited_linux.png
diff --git a/monkey_island/cc/ui/src/images/nodes/exploited_windows.png b/monkey/monkey_island/cc/ui/src/images/nodes/exploited_windows.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/exploited_windows.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/exploited_windows.png
diff --git a/monkey_island/cc/ui/src/images/nodes/island.png b/monkey/monkey_island/cc/ui/src/images/nodes/island.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/island.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/island.png
diff --git a/monkey_island/cc/ui/src/images/nodes/island_monkey_linux.png b/monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_linux.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/island_monkey_linux.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_linux.png
diff --git a/monkey_island/cc/ui/src/images/nodes/island_monkey_linux_running.png b/monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_linux_running.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/island_monkey_linux_running.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_linux_running.png
diff --git a/monkey_island/cc/ui/src/images/nodes/island_monkey_windows.png b/monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_windows.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/island_monkey_windows.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_windows.png
diff --git a/monkey_island/cc/ui/src/images/nodes/island_monkey_windows_running.png b/monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_windows_running.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/island_monkey_windows_running.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/island_monkey_windows_running.png
diff --git a/monkey_island/cc/ui/src/images/nodes/manual_linux.png b/monkey/monkey_island/cc/ui/src/images/nodes/manual_linux.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/manual_linux.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/manual_linux.png
diff --git a/monkey_island/cc/ui/src/images/nodes/manual_linux_running.png b/monkey/monkey_island/cc/ui/src/images/nodes/manual_linux_running.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/manual_linux_running.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/manual_linux_running.png
diff --git a/monkey_island/cc/ui/src/images/nodes/manual_windows.png b/monkey/monkey_island/cc/ui/src/images/nodes/manual_windows.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/manual_windows.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/manual_windows.png
diff --git a/monkey_island/cc/ui/src/images/nodes/manual_windows_running.png b/monkey/monkey_island/cc/ui/src/images/nodes/manual_windows_running.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/manual_windows_running.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/manual_windows_running.png
diff --git a/monkey_island/cc/ui/src/images/nodes/monkey_linux.png b/monkey/monkey_island/cc/ui/src/images/nodes/monkey_linux.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/monkey_linux.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/monkey_linux.png
diff --git a/monkey_island/cc/ui/src/images/nodes/monkey_linux_running.png b/monkey/monkey_island/cc/ui/src/images/nodes/monkey_linux_running.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/monkey_linux_running.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/monkey_linux_running.png
diff --git a/monkey_island/cc/ui/src/images/nodes/monkey_windows.png b/monkey/monkey_island/cc/ui/src/images/nodes/monkey_windows.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/monkey_windows.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/monkey_windows.png
diff --git a/monkey_island/cc/ui/src/images/nodes/monkey_windows_running.png b/monkey/monkey_island/cc/ui/src/images/nodes/monkey_windows_running.png
similarity index 100%
rename from monkey_island/cc/ui/src/images/nodes/monkey_windows_running.png
rename to monkey/monkey_island/cc/ui/src/images/nodes/monkey_windows_running.png
diff --git a/monkey_island/cc/ui/src/index.html b/monkey/monkey_island/cc/ui/src/index.html
similarity index 100%
rename from monkey_island/cc/ui/src/index.html
rename to monkey/monkey_island/cc/ui/src/index.html
diff --git a/monkey_island/cc/ui/src/index.js b/monkey/monkey_island/cc/ui/src/index.js
similarity index 100%
rename from monkey_island/cc/ui/src/index.js
rename to monkey/monkey_island/cc/ui/src/index.js
diff --git a/monkey_island/cc/ui/src/server_config/AwsConfig.js b/monkey/monkey_island/cc/ui/src/server_config/AwsConfig.js
similarity index 100%
rename from monkey_island/cc/ui/src/server_config/AwsConfig.js
rename to monkey/monkey_island/cc/ui/src/server_config/AwsConfig.js
diff --git a/monkey_island/cc/ui/src/server_config/BaseConfig.js b/monkey/monkey_island/cc/ui/src/server_config/BaseConfig.js
similarity index 100%
rename from monkey_island/cc/ui/src/server_config/BaseConfig.js
rename to monkey/monkey_island/cc/ui/src/server_config/BaseConfig.js
diff --git a/monkey_island/cc/ui/src/server_config/ServerConfig.js b/monkey/monkey_island/cc/ui/src/server_config/ServerConfig.js
similarity index 100%
rename from monkey_island/cc/ui/src/server_config/ServerConfig.js
rename to monkey/monkey_island/cc/ui/src/server_config/ServerConfig.js
diff --git a/monkey_island/cc/ui/src/server_config/StandardConfig.js b/monkey/monkey_island/cc/ui/src/server_config/StandardConfig.js
similarity index 100%
rename from monkey_island/cc/ui/src/server_config/StandardConfig.js
rename to monkey/monkey_island/cc/ui/src/server_config/StandardConfig.js
diff --git a/monkey_island/cc/ui/src/services/AuthService.js b/monkey/monkey_island/cc/ui/src/services/AuthService.js
similarity index 100%
rename from monkey_island/cc/ui/src/services/AuthService.js
rename to monkey/monkey_island/cc/ui/src/services/AuthService.js
diff --git a/monkey_island/cc/ui/src/styles/App.css b/monkey/monkey_island/cc/ui/src/styles/App.css
similarity index 100%
rename from monkey_island/cc/ui/src/styles/App.css
rename to monkey/monkey_island/cc/ui/src/styles/App.css
diff --git a/monkey_island/cc/ui/webpack.config.js b/monkey/monkey_island/cc/ui/webpack.config.js
similarity index 100%
rename from monkey_island/cc/ui/webpack.config.js
rename to monkey/monkey_island/cc/ui/webpack.config.js
diff --git a/monkey_island/cc/utils.py b/monkey/monkey_island/cc/utils.py
similarity index 100%
rename from monkey_island/cc/utils.py
rename to monkey/monkey_island/cc/utils.py
diff --git a/monkey_island/deb-package/DEBIAN/control b/monkey/monkey_island/deb-package/DEBIAN/control
similarity index 100%
rename from monkey_island/deb-package/DEBIAN/control
rename to monkey/monkey_island/deb-package/DEBIAN/control
diff --git a/monkey/monkey_island/deb-package/DEBIAN/postinst b/monkey/monkey_island/deb-package/DEBIAN/postinst
new file mode 100644
index 000000000..b55f791b8
--- /dev/null
+++ b/monkey/monkey_island/deb-package/DEBIAN/postinst
@@ -0,0 +1,34 @@
+#!/bin/bash
+
+MONKEY_FOLDER=/var/monkey
+INSTALLATION_FOLDER=/var/monkey/monkey_island/installation
+PYTHON_FOLDER=/var/monkey/monkey_island/bin/python
+
+# Prepare python virtualenv
+pip2 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER
+virtualenv -p python2.7 ${PYTHON_FOLDER}
+
+# install pip requirements
+${PYTHON_FOLDER}/bin/python -m pip install -r $MONKEY_FOLDER/monkey_island/pip_requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER
+
+# remove installation folder and unnecessary files
+rm -rf ${INSTALLATION_FOLDER}
+rm -f ${MONKEY_FOLDER}/monkey_island/pip_requirements.txt
+
+cp ${MONKEY_FOLDER}/monkey_island/ubuntu/* /etc/init/
+if [ -d "/etc/systemd/network" ]; then
+    cp ${MONKEY_FOLDER}/monkey_island/ubuntu/systemd/*.service /lib/systemd/system/
+    chmod +x ${MONKEY_FOLDER}/monkey_island/ubuntu/systemd/start_server.sh
+    systemctl daemon-reload
+    systemctl enable monkey-mongo
+    systemctl enable monkey-island
+fi
+
+${MONKEY_FOLDER}/monkey_island/create_certificate.sh
+
+service monkey-island start
+service monkey-mongo start
+
+echo Monkey Island installation ended
+
+exit 0
\ No newline at end of file
diff --git a/monkey_island/deb-package/DEBIAN/prerm b/monkey/monkey_island/deb-package/DEBIAN/prerm
similarity index 91%
rename from monkey_island/deb-package/DEBIAN/prerm
rename to monkey/monkey_island/deb-package/DEBIAN/prerm
index 98557e487..69070adaf 100644
--- a/monkey_island/deb-package/DEBIAN/prerm
+++ b/monkey/monkey_island/deb-package/DEBIAN/prerm
@@ -8,6 +8,6 @@ rm -f /etc/init/monkey-mongo.conf
 [ -f "/lib/systemd/system/monkey-island.service" ] && rm -f /lib/systemd/system/monkey-island.service
 [ -f "/lib/systemd/system/monkey-mongo.service" ] && rm -f /lib/systemd/system/monkey-mongo.service
 
-rm -r -f /var/monkey_island
+rm -r -f /var/monkey
 
 exit 0
\ No newline at end of file
diff --git a/monkey_island/deb-package/monkey_island_pip_requirements.txt b/monkey/monkey_island/deb-package/monkey_island_pip_requirements.txt
similarity index 100%
rename from monkey_island/deb-package/monkey_island_pip_requirements.txt
rename to monkey/monkey_island/deb-package/monkey_island_pip_requirements.txt
diff --git a/monkey_island/linux/clear_db.sh b/monkey/monkey_island/linux/clear_db.sh
similarity index 73%
rename from monkey_island/linux/clear_db.sh
rename to monkey/monkey_island/linux/clear_db.sh
index d6839ed2a..7ec819cd5 100644
--- a/monkey_island/linux/clear_db.sh
+++ b/monkey/monkey_island/linux/clear_db.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 service monkey-mongo stop
-cd /var/monkey_island
+cd /var/monkey/monkey_island
 rm -rf ./db/*
 service monkey-mongo start
diff --git a/monkey_island/linux/create_certificate.sh b/monkey/monkey_island/linux/create_certificate.sh
similarity index 90%
rename from monkey_island/linux/create_certificate.sh
rename to monkey/monkey_island/linux/create_certificate.sh
index 32fa9756d..477440a6f 100644
--- a/monkey_island/linux/create_certificate.sh
+++ b/monkey/monkey_island/linux/create_certificate.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-cd /var/monkey_island
+cd /var/monkey/monkey_island
 openssl genrsa -out cc/server.key 1024
 openssl req -new -key cc/server.key -out cc/server.csr -subj "/C=GB/ST=London/L=London/O=Global Security/OU=Monkey Department/CN=monkey.com"
 openssl x509 -req -days 366 -in cc/server.csr -signkey cc/server.key -out cc/server.crt
diff --git a/monkey_island/linux/install.sh b/monkey/monkey_island/linux/install.sh
similarity index 77%
rename from monkey_island/linux/install.sh
rename to monkey/monkey_island/linux/install.sh
index f230b58d2..d4ebfedbe 100644
--- a/monkey_island/linux/install.sh
+++ b/monkey/monkey_island/linux/install.sh
@@ -10,5 +10,5 @@ else
 fi
 
 MONKEY_FILE=monkey-linux-$ARCH
-cp -f /var/monkey_island/cc/binaries/$MONKEY_FILE /tmp
+cp -f /var/monkey/monkey_island/cc/binaries/$MONKEY_FILE /tmp
 /tmp/$MONKEY_FILE m0nk3y $@
diff --git a/monkey_island/linux/monkey.sh b/monkey/monkey_island/linux/monkey.sh
similarity index 77%
rename from monkey_island/linux/monkey.sh
rename to monkey/monkey_island/linux/monkey.sh
index f230b58d2..d4ebfedbe 100644
--- a/monkey_island/linux/monkey.sh
+++ b/monkey/monkey_island/linux/monkey.sh
@@ -10,5 +10,5 @@ else
 fi
 
 MONKEY_FILE=monkey-linux-$ARCH
-cp -f /var/monkey_island/cc/binaries/$MONKEY_FILE /tmp
+cp -f /var/monkey/monkey_island/cc/binaries/$MONKEY_FILE /tmp
 /tmp/$MONKEY_FILE m0nk3y $@
diff --git a/monkey/monkey_island/linux/run.sh b/monkey/monkey_island/linux/run.sh
new file mode 100644
index 000000000..6770e2922
--- /dev/null
+++ b/monkey/monkey_island/linux/run.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cd /var/monkey
+/var/monkey/monkey_island/bin/mongodb/bin/mongod --quiet --dbpath /var/monkey/monkey_island/db &
+/var/monkey/monkey_island/bin/python/bin/python monkey_island/cc/main.py
\ No newline at end of file
diff --git a/monkey_island/linux/ubuntu/monkey-island.conf b/monkey/monkey_island/linux/ubuntu/monkey-island.conf
similarity index 76%
rename from monkey_island/linux/ubuntu/monkey-island.conf
rename to monkey/monkey_island/linux/ubuntu/monkey-island.conf
index 360559b31..1ded4d94a 100644
--- a/monkey_island/linux/ubuntu/monkey-island.conf
+++ b/monkey/monkey_island/linux/ubuntu/monkey-island.conf
@@ -7,8 +7,8 @@ respawn
 respawn limit unlimited
 
 script
-	chdir /var/monkey_island/cc
-	exec python main.py
+	chdir /var/monkey
+	exec python monkey_island/cc/main.py
 end script
 
 post-stop script
diff --git a/monkey_island/linux/ubuntu/monkey-mongo.conf b/monkey/monkey_island/linux/ubuntu/monkey-mongo.conf
similarity index 67%
rename from monkey_island/linux/ubuntu/monkey-mongo.conf
rename to monkey/monkey_island/linux/ubuntu/monkey-mongo.conf
index df9145014..cd148d877 100644
--- a/monkey_island/linux/ubuntu/monkey-mongo.conf
+++ b/monkey/monkey_island/linux/ubuntu/monkey-mongo.conf
@@ -7,8 +7,8 @@ respawn
 respawn limit unlimited
 
 script
-	chdir /var/monkey_island/
-	exec /var/monkey_island/bin/mongodb/bin/mongod --dbpath db
+	chdir /var/monkey/monkey_island/
+	exec /var/monkey/monkey_island/bin/mongodb/bin/mongod --dbpath db
 end script
 
 post-stop script
diff --git a/monkey_island/linux/ubuntu/systemd/monkey-island.service b/monkey/monkey_island/linux/ubuntu/systemd/monkey-island.service
similarity index 56%
rename from monkey_island/linux/ubuntu/systemd/monkey-island.service
rename to monkey/monkey_island/linux/ubuntu/systemd/monkey-island.service
index 8868dc3aa..d66de2377 100644
--- a/monkey_island/linux/ubuntu/systemd/monkey-island.service
+++ b/monkey/monkey_island/linux/ubuntu/systemd/monkey-island.service
@@ -5,7 +5,7 @@ After=network.target
 
 [Service]
 Type=simple
-ExecStart=/var/monkey_island/ubuntu/systemd/start_server.sh
+ExecStart=/var/monkey/monkey_island/ubuntu/systemd/start_server.sh
 
 [Install]
 WantedBy=multi-user.target
\ No newline at end of file
diff --git a/monkey/monkey_island/linux/ubuntu/systemd/monkey-mongo.service b/monkey/monkey_island/linux/ubuntu/systemd/monkey-mongo.service
new file mode 100644
index 000000000..b786e0abb
--- /dev/null
+++ b/monkey/monkey_island/linux/ubuntu/systemd/monkey-mongo.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=Monkey Island Mongo Service
+After=network.target
+
+[Service]
+ExecStart=/var/monkey/monkey_island/bin/mongodb/bin/mongod --quiet --dbpath /var/monkey/monkey_island/db
+KillMode=process
+Restart=always
+ExecStop=/var/monkey/monkey_island/bin/mongodb/bin/mongod --shutdown
+
+[Install]
+WantedBy=multi-user.target
\ No newline at end of file
diff --git a/monkey/monkey_island/linux/ubuntu/systemd/start_server.sh b/monkey/monkey_island/linux/ubuntu/systemd/start_server.sh
new file mode 100644
index 000000000..978e02fe5
--- /dev/null
+++ b/monkey/monkey_island/linux/ubuntu/systemd/start_server.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+
+cd /var/monkey
+/var/monkey/monkey_island/bin/python/bin/python monkey_island.py
\ No newline at end of file
diff --git a/monkey_island/readme.txt b/monkey/monkey_island/readme.txt
similarity index 100%
rename from monkey_island/readme.txt
rename to monkey/monkey_island/readme.txt
diff --git a/monkey_island/requirements.txt b/monkey/monkey_island/requirements.txt
similarity index 100%
rename from monkey_island/requirements.txt
rename to monkey/monkey_island/requirements.txt
diff --git a/monkey_island/windows/clear_db.bat b/monkey/monkey_island/windows/clear_db.bat
similarity index 100%
rename from monkey_island/windows/clear_db.bat
rename to monkey/monkey_island/windows/clear_db.bat
diff --git a/monkey_island/windows/copyShortcutOnDesktop.bat b/monkey/monkey_island/windows/copyShortcutOnDesktop.bat
similarity index 100%
rename from monkey_island/windows/copyShortcutOnDesktop.bat
rename to monkey/monkey_island/windows/copyShortcutOnDesktop.bat
diff --git a/monkey_island/windows/create_certificate.bat b/monkey/monkey_island/windows/create_certificate.bat
similarity index 100%
rename from monkey_island/windows/create_certificate.bat
rename to monkey/monkey_island/windows/create_certificate.bat
diff --git a/monkey_island/windows/openssl.cfg b/monkey/monkey_island/windows/openssl.cfg
similarity index 100%
rename from monkey_island/windows/openssl.cfg
rename to monkey/monkey_island/windows/openssl.cfg
diff --git a/monkey_island/windows/removeShortcutFromDesktop.bat b/monkey/monkey_island/windows/removeShortcutFromDesktop.bat
similarity index 100%
rename from monkey_island/windows/removeShortcutFromDesktop.bat
rename to monkey/monkey_island/windows/removeShortcutFromDesktop.bat
diff --git a/monkey/monkey_island/windows/run_cc.bat b/monkey/monkey_island/windows/run_cc.bat
new file mode 100644
index 000000000..e86b5a145
--- /dev/null
+++ b/monkey/monkey_island/windows/run_cc.bat
@@ -0,0 +1,4 @@
+@title C^&C Server
+@pushd ..
+@monkey_island\bin\Python27\python monkey_island.py
+@popd
\ No newline at end of file
diff --git a/monkey_island/windows/run_mongodb.bat b/monkey/monkey_island/windows/run_mongodb.bat
similarity index 100%
rename from monkey_island/windows/run_mongodb.bat
rename to monkey/monkey_island/windows/run_mongodb.bat
diff --git a/monkey_island/windows/run_server.bat b/monkey/monkey_island/windows/run_server.bat
similarity index 100%
rename from monkey_island/windows/run_server.bat
rename to monkey/monkey_island/windows/run_server.bat
diff --git a/monkey_island/deb-package/DEBIAN/postinst b/monkey_island/deb-package/DEBIAN/postinst
deleted file mode 100644
index 3fa922a01..000000000
--- a/monkey_island/deb-package/DEBIAN/postinst
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-MONKEY_FOLDER=/var/monkey_island
-INSTALLATION_FOLDER=/var/monkey_island/installation
-PYTHON_FOLDER=/var/monkey_island/bin/python
-
-cp -f ${MONKEY_FOLDER}/monkey.sh /usr/bin/monkey
-chmod 755 /usr/bin/monkey
-
-# Prepare python virtualenv
-pip2 install virtualenv --no-index --find-links file://$INSTALLATION_FOLDER
-virtualenv -p python2.7 ${PYTHON_FOLDER}
-
-# install pip requirements
-${PYTHON_FOLDER}/bin/python -m pip install -r $MONKEY_FOLDER/pip_requirements.txt --no-index --find-links file://$INSTALLATION_FOLDER
-
-# remove installation folder and unnecessary files
-rm -rf ${INSTALLATION_FOLDER}
-rm -f ${MONKEY_FOLDER}/pip_requirements.txt
-
-cp ${MONKEY_FOLDER}/ubuntu/* /etc/init/
-if [ -d "/etc/systemd/network" ]; then
-    cp ${MONKEY_FOLDER}/ubuntu/systemd/*.service /lib/systemd/system/
-    chmod +x ${MONKEY_FOLDER}/ubuntu/systemd/start_server.sh
-    systemctl daemon-reload
-    systemctl enable monkey-mongo
-    systemctl enable monkey-island
-fi
-
-${MONKEY_FOLDER}/create_certificate.sh
-
-service monkey-island start
-service monkey-mongo start
-
-echo Monkey Island installation ended
-
-exit 0
\ No newline at end of file
diff --git a/monkey_island/linux/run.sh b/monkey_island/linux/run.sh
deleted file mode 100644
index 485d6eff1..000000000
--- a/monkey_island/linux/run.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-
-cd /var/monkey_island/cc
-/var/monkey_island/bin/mongodb/bin/mongod --quiet --dbpath /var/monkey_island/db &
-/var/monkey_island/bin/python/bin/python main.py
\ No newline at end of file
diff --git a/monkey_island/linux/ubuntu/systemd/monkey-mongo.service b/monkey_island/linux/ubuntu/systemd/monkey-mongo.service
deleted file mode 100644
index 6c1fee8f8..000000000
--- a/monkey_island/linux/ubuntu/systemd/monkey-mongo.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Monkey Island Mongo Service
-After=network.target
-
-[Service]
-ExecStart=/var/monkey_island/bin/mongodb/bin/mongod --quiet --dbpath /var/monkey_island/db
-KillMode=process
-Restart=always
-ExecStop=/var/monkey_island/bin/mongodb/bin/mongod --shutdown
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file
diff --git a/monkey_island/linux/ubuntu/systemd/start_server.sh b/monkey_island/linux/ubuntu/systemd/start_server.sh
deleted file mode 100644
index ceeab57f4..000000000
--- a/monkey_island/linux/ubuntu/systemd/start_server.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /var/monkey_island/cc
-/var/monkey_island/bin/python/bin/python main.py
\ No newline at end of file
diff --git a/monkey_island/windows/run_cc.bat b/monkey_island/windows/run_cc.bat
deleted file mode 100644
index c16c9fc6b..000000000
--- a/monkey_island/windows/run_cc.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@title C^&C Server
-@pushd cc
-@..\bin\Python27\python main.py
-@popd
\ No newline at end of file