diff --git a/README.md b/README.md
index c3fa61f..e2b6658 100755
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@
  * (This will be replaced / extended by a REST API later)
 
 ### Project structure
-* **emuvim/** all emulator code 
+* **src/emuvim/** all emulator code 
  * **api/** Data center API endpoint implementations (zerorpc, OpenStack REST, ...)
  * **cli/** CLI client to interact with a running emulator
  * **dcemulator/** Dockernet wrapper that introduces the notion of data centers and API endpoints
@@ -44,10 +44,10 @@
 
 ### Run
 * First terminal:
- * `cd ~/son-emu/emuvim`
+ * `cd ~/son-emu/src/emuvim`
  * `sudo python example_topology.py`
 * Second terminal:
- * `cd ~/son-emu/emuvim/cli`
+ * `cd ~/son-emu/src/emuvim/cli`
  * `./son-emu-cli compute start -d datacenter1 -n vnf1`
  * `./son-emu-cli compute start -d datacenter1 -n vnf2`
  * `./son-emu-cli compute list`
@@ -61,7 +61,7 @@
  * `./start_example_chain` sets up an example service chain, using the example docker container from `package_samples` https://github.com/sonata-nfv/packaging_samples/tree/master/VNFs
 
 ### Run Unit Tests
-* `cd ~/son-emu/emuvim`
+* `cd ~/son-emu/src/emuvim`
 * `sudo python test` or `sudo python test -v` for more outputs
 
 ### CLI
diff --git a/emuvim/api/__init__.py b/src/emuvim/api/__init__.py
similarity index 100%
rename from emuvim/api/__init__.py
rename to src/emuvim/api/__init__.py
diff --git a/emuvim/api/zerorpcapi.py b/src/emuvim/api/zerorpcapi.py
similarity index 100%
rename from emuvim/api/zerorpcapi.py
rename to src/emuvim/api/zerorpcapi.py
diff --git a/emuvim/api/zerorpcapi_DCNetwork.py b/src/emuvim/api/zerorpcapi_DCNetwork.py
similarity index 100%
rename from emuvim/api/zerorpcapi_DCNetwork.py
rename to src/emuvim/api/zerorpcapi_DCNetwork.py
diff --git a/emuvim/cli/__init__.py b/src/emuvim/cli/__init__.py
similarity index 100%
rename from emuvim/cli/__init__.py
rename to src/emuvim/cli/__init__.py
diff --git a/emuvim/cli/compute.py b/src/emuvim/cli/compute.py
similarity index 100%
rename from emuvim/cli/compute.py
rename to src/emuvim/cli/compute.py
diff --git a/emuvim/cli/datacenter.py b/src/emuvim/cli/datacenter.py
similarity index 100%
rename from emuvim/cli/datacenter.py
rename to src/emuvim/cli/datacenter.py
diff --git a/emuvim/cli/monitor.py b/src/emuvim/cli/monitor.py
similarity index 100%
rename from emuvim/cli/monitor.py
rename to src/emuvim/cli/monitor.py
diff --git a/emuvim/cli/network.py b/src/emuvim/cli/network.py
similarity index 100%
rename from emuvim/cli/network.py
rename to src/emuvim/cli/network.py
diff --git a/emuvim/cli/son-emu-cli b/src/emuvim/cli/son-emu-cli
similarity index 100%
rename from emuvim/cli/son-emu-cli
rename to src/emuvim/cli/son-emu-cli
diff --git a/emuvim/dcemulator/__init__.py b/src/emuvim/dcemulator/__init__.py
similarity index 100%
rename from emuvim/dcemulator/__init__.py
rename to src/emuvim/dcemulator/__init__.py
diff --git a/emuvim/dcemulator/link.py b/src/emuvim/dcemulator/link.py
similarity index 100%
rename from emuvim/dcemulator/link.py
rename to src/emuvim/dcemulator/link.py
diff --git a/emuvim/dcemulator/monitoring.py b/src/emuvim/dcemulator/monitoring.py
similarity index 100%
rename from emuvim/dcemulator/monitoring.py
rename to src/emuvim/dcemulator/monitoring.py
diff --git a/emuvim/dcemulator/net.py b/src/emuvim/dcemulator/net.py
similarity index 100%
rename from emuvim/dcemulator/net.py
rename to src/emuvim/dcemulator/net.py
diff --git a/emuvim/dcemulator/node.py b/src/emuvim/dcemulator/node.py
similarity index 100%
rename from emuvim/dcemulator/node.py
rename to src/emuvim/dcemulator/node.py
diff --git a/emuvim/example_topology.py b/src/emuvim/example_topology.py
similarity index 100%
rename from emuvim/example_topology.py
rename to src/emuvim/example_topology.py
diff --git a/emuvim/test/__main__.py b/src/emuvim/test/__main__.py
similarity index 100%
rename from emuvim/test/__main__.py
rename to src/emuvim/test/__main__.py
diff --git a/emuvim/test/runner.py b/src/emuvim/test/runner.py
similarity index 100%
rename from emuvim/test/runner.py
rename to src/emuvim/test/runner.py
diff --git a/emuvim/test/test_api_zerorpc.py b/src/emuvim/test/test_api_zerorpc.py
similarity index 100%
rename from emuvim/test/test_api_zerorpc.py
rename to src/emuvim/test/test_api_zerorpc.py
diff --git a/emuvim/test/test_emulator.py b/src/emuvim/test/test_emulator.py
similarity index 100%
rename from emuvim/test/test_emulator.py
rename to src/emuvim/test/test_emulator.py