diff --git a/example/odoo/Dockerfile b/example/Dockerfile
similarity index 76%
rename from example/odoo/Dockerfile
rename to example/Dockerfile
index b5f89f26..4c177635 100644
--- a/example/odoo/Dockerfile
+++ b/example/Dockerfile
@@ -9,8 +9,7 @@ MAINTAINER Camptocamp
 # time of the image on the server (layers are reused)
 RUN mkdir -p /odoo/src/odoo
 COPY ./src /odoo/src/odoo
-COPY ./external-src /odoo/external-src
-COPY ./local-src /odoo/local-src
+COPY ./odoo/addons /odoo/odoo/addons
 COPY ./data /odoo/data
 COPY ./songs /odoo/songs
 COPY ./setup.py /odoo/
@@ -26,11 +25,11 @@ RUN set -x; \
 
 COPY ./requirements.txt /odoo/
 USER odoo
-RUN pip install -e /odoo
-RUN pip install -e /odoo/src/odoo
+RUN cd /odoo && pip install --user -r requirements.txt
+RUN pip install --user -e /odoo/src/odoo
+RUN pip install --user -e /odoo
 
 # Project's specifics packages
-RUN cd /odoo && pip install -r requirements.txt
 
-ENV ADDONS_PATH=/odoo/local-src,/odoo/src/odoo/addons
+ENV ADDONS_PATH=/odoo/odoo/addons,/odoo/src/odoo/addons
 
diff --git a/example/odoo/Dockerfile-onbuild b/example/Dockerfile-onbuild
similarity index 87%
rename from example/odoo/Dockerfile-onbuild
rename to example/Dockerfile-onbuild
index acfaf009..752924f3 100644
--- a/example/odoo/Dockerfile-onbuild
+++ b/example/Dockerfile-onbuild
@@ -12,4 +12,4 @@ RUN set -x; \
 COPY ./requirements.txt /odoo/
 RUN cd /odoo && pip install -r requirements.txt
 
-ENV ADDONS_PATH=/odoo/local-src,/odoo/src/addons
+ENV ADDONS_PATH=/odoo/odoo/addons,/odoo/src/addons
diff --git a/example/README.md b/example/README.md
index efca18a0..dc0434de 100644
--- a/example/README.md
+++ b/example/README.md
@@ -8,7 +8,7 @@ Follow the steps:
 
 1. Create directories. This is mandatory, they will be copied in the image
 
-        mkdir -p odoo/external-src odoo/local-src odoo/data odoo/songs
+        mkdir -p  odoo/addons data songs
 
 2. Add a submodule for Odoo (official or OCA/OCB)
 
@@ -16,10 +16,10 @@ Follow the steps:
         git submodule add git@github.com:odoo/odoo.git odoo/src
 
 3. Optionally add submodules for external addons in `odoo/external-src`
- 
+
         git submodule add git@github.com:OCA/server-tools.git odoo/external-src/server-tools
 
-4. Optionally add custom addons in `odoo/local-src`
+4. Optionally add custom addons in `odoo/addons`
 
 6. Create the Dockerfile, the bare minimum being (see also [the example
    file](odoo/Dockerfile) that installs additional dependencies):
diff --git a/example/odoo/data/images/logo.png b/example/data/images/logo.png
similarity index 100%
rename from example/odoo/data/images/logo.png
rename to example/data/images/logo.png
diff --git a/example/odoo/migration.yml b/example/migration.yml
similarity index 100%
rename from example/odoo/migration.yml
rename to example/migration.yml
diff --git a/example/odoo/local-src/README.md b/example/odoo/addons/README.md
similarity index 100%
rename from example/odoo/local-src/README.md
rename to example/odoo/addons/README.md
diff --git a/example/odoo/local-src/dummy_test/__init__.py b/example/odoo/addons/dummy_test/__init__.py
similarity index 100%
rename from example/odoo/local-src/dummy_test/__init__.py
rename to example/odoo/addons/dummy_test/__init__.py
diff --git a/example/odoo/local-src/dummy_test/__openerp__.py b/example/odoo/addons/dummy_test/__openerp__.py
similarity index 100%
rename from example/odoo/local-src/dummy_test/__openerp__.py
rename to example/odoo/addons/dummy_test/__openerp__.py
diff --git a/example/odoo/local-src/dummy_test/tests/__init__.py b/example/odoo/addons/dummy_test/tests/__init__.py
similarity index 100%
rename from example/odoo/local-src/dummy_test/tests/__init__.py
rename to example/odoo/addons/dummy_test/tests/__init__.py
diff --git a/example/odoo/local-src/dummy_test/tests/test_dummy.py b/example/odoo/addons/dummy_test/tests/test_dummy.py
similarity index 100%
rename from example/odoo/local-src/dummy_test/tests/test_dummy.py
rename to example/odoo/addons/dummy_test/tests/test_dummy.py
diff --git a/example/odoo/external-src/README.md b/example/odoo/external-src/README.md
deleted file mode 100644
index 43011faa..00000000
--- a/example/odoo/external-src/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Here you should have OCA or other repositories as submodules.
diff --git a/example/odoo/requirements.txt b/example/requirements.txt
similarity index 100%
rename from example/odoo/requirements.txt
rename to example/requirements.txt
diff --git a/example/odoo/songs/__init__.py b/example/songs/__init__.py
similarity index 100%
rename from example/odoo/songs/__init__.py
rename to example/songs/__init__.py
diff --git a/example/odoo/songs/install/__init__.py b/example/songs/install/__init__.py
similarity index 100%
rename from example/odoo/songs/install/__init__.py
rename to example/songs/install/__init__.py
diff --git a/example/odoo/songs/install/base.py b/example/songs/install/base.py
similarity index 100%
rename from example/odoo/songs/install/base.py
rename to example/songs/install/base.py
diff --git a/example/odoo/songs/install/demo.py b/example/songs/install/demo.py
similarity index 100%
rename from example/odoo/songs/install/demo.py
rename to example/songs/install/demo.py