diff --git a/Chapter15/my_module/__init__.py b/Chapter14/my_module/__init__.py
similarity index 100%
rename from Chapter15/my_module/__init__.py
rename to Chapter14/my_module/__init__.py
diff --git a/Chapter15/my_module/__manifest__.py b/Chapter14/my_module/__manifest__.py
similarity index 100%
rename from Chapter15/my_module/__manifest__.py
rename to Chapter14/my_module/__manifest__.py
diff --git a/Chapter15/my_module/models/__init__.py b/Chapter14/my_module/models/__init__.py
similarity index 100%
rename from Chapter15/my_module/models/__init__.py
rename to Chapter14/my_module/models/__init__.py
diff --git a/Chapter15/my_module/models/library_book.py b/Chapter14/my_module/models/library_book.py
similarity index 100%
rename from Chapter15/my_module/models/library_book.py
rename to Chapter14/my_module/models/library_book.py
diff --git a/Chapter15/my_module/views/library_book.xml b/Chapter14/my_module/views/library_book.xml
similarity index 100%
rename from Chapter15/my_module/views/library_book.xml
rename to Chapter14/my_module/views/library_book.xml
diff --git a/Chapter15/r1_path/__init__.py b/Chapter14/r1_path/__init__.py
similarity index 100%
rename from Chapter15/r1_path/__init__.py
rename to Chapter14/r1_path/__init__.py
diff --git a/Chapter15/r1_path/__manifest__.py b/Chapter14/r1_path/__manifest__.py
similarity index 100%
rename from Chapter15/r1_path/__manifest__.py
rename to Chapter14/r1_path/__manifest__.py
diff --git a/Chapter15/r1_path/controllers/__init__.py b/Chapter14/r1_path/controllers/__init__.py
similarity index 100%
rename from Chapter15/r1_path/controllers/__init__.py
rename to Chapter14/r1_path/controllers/__init__.py
diff --git a/Chapter15/r1_path/controllers/main.py b/Chapter14/r1_path/controllers/main.py
similarity index 100%
rename from Chapter15/r1_path/controllers/main.py
rename to Chapter14/r1_path/controllers/main.py
diff --git a/Chapter15/r2_restrict/__init__.py b/Chapter14/r2_restrict/__init__.py
similarity index 100%
rename from Chapter15/r2_restrict/__init__.py
rename to Chapter14/r2_restrict/__init__.py
diff --git a/Chapter15/r2_restrict/__manifest__.py b/Chapter14/r2_restrict/__manifest__.py
similarity index 100%
rename from Chapter15/r2_restrict/__manifest__.py
rename to Chapter14/r2_restrict/__manifest__.py
diff --git a/Chapter15/r2_restrict/controllers/__init__.py b/Chapter14/r2_restrict/controllers/__init__.py
similarity index 100%
rename from Chapter15/r2_restrict/controllers/__init__.py
rename to Chapter14/r2_restrict/controllers/__init__.py
diff --git a/Chapter15/r2_restrict/controllers/main.py b/Chapter14/r2_restrict/controllers/main.py
similarity index 100%
rename from Chapter15/r2_restrict/controllers/main.py
rename to Chapter14/r2_restrict/controllers/main.py
diff --git a/Chapter15/r2_restrict/models/__init__.py b/Chapter14/r2_restrict/models/__init__.py
similarity index 100%
rename from Chapter15/r2_restrict/models/__init__.py
rename to Chapter14/r2_restrict/models/__init__.py
diff --git a/Chapter15/r2_restrict/models/ir_http.py b/Chapter14/r2_restrict/models/ir_http.py
similarity index 100%
rename from Chapter15/r2_restrict/models/ir_http.py
rename to Chapter14/r2_restrict/models/ir_http.py
diff --git a/Chapter15/r3_consume_parameters/__init__.py b/Chapter14/r3_consume_parameters/__init__.py
similarity index 100%
rename from Chapter15/r3_consume_parameters/__init__.py
rename to Chapter14/r3_consume_parameters/__init__.py
diff --git a/Chapter15/r3_consume_parameters/__manifest__.py b/Chapter14/r3_consume_parameters/__manifest__.py
similarity index 100%
rename from Chapter15/r3_consume_parameters/__manifest__.py
rename to Chapter14/r3_consume_parameters/__manifest__.py
diff --git a/Chapter15/r3_consume_parameters/controllers/__init__.py b/Chapter14/r3_consume_parameters/controllers/__init__.py
similarity index 100%
rename from Chapter15/r3_consume_parameters/controllers/__init__.py
rename to Chapter14/r3_consume_parameters/controllers/__init__.py
diff --git a/Chapter15/r3_consume_parameters/controllers/main.py b/Chapter14/r3_consume_parameters/controllers/main.py
similarity index 100%
rename from Chapter15/r3_consume_parameters/controllers/main.py
rename to Chapter14/r3_consume_parameters/controllers/main.py
diff --git a/Chapter15/r3_consume_parameters/models/__init__.py b/Chapter14/r3_consume_parameters/models/__init__.py
similarity index 100%
rename from Chapter15/r3_consume_parameters/models/__init__.py
rename to Chapter14/r3_consume_parameters/models/__init__.py
diff --git a/Chapter15/r3_consume_parameters/models/ir_http.py b/Chapter14/r3_consume_parameters/models/ir_http.py
similarity index 100%
rename from Chapter15/r3_consume_parameters/models/ir_http.py
rename to Chapter14/r3_consume_parameters/models/ir_http.py
diff --git a/Chapter15/r4_modify/__init__.py b/Chapter14/r4_modify/__init__.py
similarity index 100%
rename from Chapter15/r4_modify/__init__.py
rename to Chapter14/r4_modify/__init__.py
diff --git a/Chapter15/r4_modify/__manifest__.py b/Chapter14/r4_modify/__manifest__.py
similarity index 100%
rename from Chapter15/r4_modify/__manifest__.py
rename to Chapter14/r4_modify/__manifest__.py
diff --git a/Chapter15/r4_modify/controllers/__init__.py b/Chapter14/r4_modify/controllers/__init__.py
similarity index 100%
rename from Chapter15/r4_modify/controllers/__init__.py
rename to Chapter14/r4_modify/controllers/__init__.py
diff --git a/Chapter15/r4_modify/controllers/main.py b/Chapter14/r4_modify/controllers/main.py
similarity index 100%
rename from Chapter15/r4_modify/controllers/main.py
rename to Chapter14/r4_modify/controllers/main.py
diff --git a/Chapter15/r4_modify/views/templates.xml b/Chapter14/r4_modify/views/templates.xml
similarity index 100%
rename from Chapter15/r4_modify/views/templates.xml
rename to Chapter14/r4_modify/views/templates.xml
diff --git a/Chapter15/r5_rpc/jsonrpc_demo.py b/Chapter14/r5_rpc/jsonrpc_demo.py
similarity index 100%
rename from Chapter15/r5_rpc/jsonrpc_demo.py
rename to Chapter14/r5_rpc/jsonrpc_demo.py
diff --git a/Chapter15/r5_rpc/xmlrpc_demo.py b/Chapter14/r5_rpc/xmlrpc_demo.py
similarity index 100%
rename from Chapter15/r5_rpc/xmlrpc_demo.py
rename to Chapter14/r5_rpc/xmlrpc_demo.py
diff --git a/Chapter14/r1_widgets/__init__.py b/Chapter15/r1_css_js/__init__.py
similarity index 100%
rename from Chapter14/r1_widgets/__init__.py
rename to Chapter15/r1_css_js/__init__.py
diff --git a/Chapter16/r1_css_js/__manifest__.py b/Chapter15/r1_css_js/__manifest__.py
similarity index 100%
rename from Chapter16/r1_css_js/__manifest__.py
rename to Chapter15/r1_css_js/__manifest__.py
diff --git a/Chapter16/r1_css_js/static/src/css/r1_css_js.css b/Chapter15/r1_css_js/static/src/css/r1_css_js.css
similarity index 100%
rename from Chapter16/r1_css_js/static/src/css/r1_css_js.css
rename to Chapter15/r1_css_js/static/src/css/r1_css_js.css
diff --git a/Chapter16/r1_css_js/static/src/js/r1_css_js.js b/Chapter15/r1_css_js/static/src/js/r1_css_js.js
similarity index 100%
rename from Chapter16/r1_css_js/static/src/js/r1_css_js.js
rename to Chapter15/r1_css_js/static/src/js/r1_css_js.js
diff --git a/Chapter16/r1_css_js/views/templates.xml b/Chapter15/r1_css_js/views/templates.xml
similarity index 100%
rename from Chapter16/r1_css_js/views/templates.xml
rename to Chapter15/r1_css_js/views/templates.xml
diff --git a/Chapter16/r2_templates/__init__.py b/Chapter15/r2_templates/__init__.py
similarity index 100%
rename from Chapter16/r2_templates/__init__.py
rename to Chapter15/r2_templates/__init__.py
diff --git a/Chapter16/r2_templates/__manifest__.py b/Chapter15/r2_templates/__manifest__.py
similarity index 100%
rename from Chapter16/r2_templates/__manifest__.py
rename to Chapter15/r2_templates/__manifest__.py
diff --git a/Chapter16/r2_templates/controllers/__init__.py b/Chapter15/r2_templates/controllers/__init__.py
similarity index 100%
rename from Chapter16/r2_templates/controllers/__init__.py
rename to Chapter15/r2_templates/controllers/__init__.py
diff --git a/Chapter16/r2_templates/controllers/main.py b/Chapter15/r2_templates/controllers/main.py
similarity index 100%
rename from Chapter16/r2_templates/controllers/main.py
rename to Chapter15/r2_templates/controllers/main.py
diff --git a/Chapter16/r2_templates/static/src/css/r2_templates.css b/Chapter15/r2_templates/static/src/css/r2_templates.css
similarity index 100%
rename from Chapter16/r2_templates/static/src/css/r2_templates.css
rename to Chapter15/r2_templates/static/src/css/r2_templates.css
diff --git a/Chapter16/r2_templates/views/library_book_templates.xml b/Chapter15/r2_templates/views/library_book_templates.xml
similarity index 100%
rename from Chapter16/r2_templates/views/library_book_templates.xml
rename to Chapter15/r2_templates/views/library_book_templates.xml
diff --git a/Chapter16/r2_templates/views/templates.xml b/Chapter15/r2_templates/views/templates.xml
similarity index 100%
rename from Chapter16/r2_templates/views/templates.xml
rename to Chapter15/r2_templates/views/templates.xml
diff --git a/Chapter14/r2_clientside_qweb/__init__.py b/Chapter15/r3_snippets/__init__.py
similarity index 100%
rename from Chapter14/r2_clientside_qweb/__init__.py
rename to Chapter15/r3_snippets/__init__.py
diff --git a/Chapter16/r3_snippets/__manifest__.py b/Chapter15/r3_snippets/__manifest__.py
similarity index 100%
rename from Chapter16/r3_snippets/__manifest__.py
rename to Chapter15/r3_snippets/__manifest__.py
diff --git a/Chapter16/r3_snippets/static/src/js/r3_snippets.js b/Chapter15/r3_snippets/static/src/js/r3_snippets.js
similarity index 100%
rename from Chapter16/r3_snippets/static/src/js/r3_snippets.js
rename to Chapter15/r3_snippets/static/src/js/r3_snippets.js
diff --git a/Chapter16/r3_snippets/views/snippets.xml b/Chapter15/r3_snippets/views/snippets.xml
similarity index 100%
rename from Chapter16/r3_snippets/views/snippets.xml
rename to Chapter15/r3_snippets/views/snippets.xml
diff --git a/Chapter16/r3_snippets/views/templates.xml b/Chapter15/r3_snippets/views/templates.xml
similarity index 100%
rename from Chapter16/r3_snippets/views/templates.xml
rename to Chapter15/r3_snippets/views/templates.xml
diff --git a/Chapter14/r3_rpc_calls/__init__.py b/Chapter16/r1_widgets/__init__.py
similarity index 100%
rename from Chapter14/r3_rpc_calls/__init__.py
rename to Chapter16/r1_widgets/__init__.py
diff --git a/Chapter14/r1_widgets/__manifest__.py b/Chapter16/r1_widgets/__manifest__.py
similarity index 100%
rename from Chapter14/r1_widgets/__manifest__.py
rename to Chapter16/r1_widgets/__manifest__.py
diff --git a/Chapter14/r1_widgets/static/src/css/r1_widgets.css b/Chapter16/r1_widgets/static/src/css/r1_widgets.css
similarity index 100%
rename from Chapter14/r1_widgets/static/src/css/r1_widgets.css
rename to Chapter16/r1_widgets/static/src/css/r1_widgets.css
diff --git a/Chapter14/r1_widgets/static/src/js/r1_widgets.js b/Chapter16/r1_widgets/static/src/js/r1_widgets.js
similarity index 100%
rename from Chapter14/r1_widgets/static/src/js/r1_widgets.js
rename to Chapter16/r1_widgets/static/src/js/r1_widgets.js
diff --git a/Chapter14/r1_widgets/views/res_partner.xml b/Chapter16/r1_widgets/views/res_partner.xml
similarity index 100%
rename from Chapter14/r1_widgets/views/res_partner.xml
rename to Chapter16/r1_widgets/views/res_partner.xml
diff --git a/Chapter14/r1_widgets/views/templates.xml b/Chapter16/r1_widgets/views/templates.xml
similarity index 100%
rename from Chapter14/r1_widgets/views/templates.xml
rename to Chapter16/r1_widgets/views/templates.xml
diff --git a/Chapter14/r4_tests/__init__.py b/Chapter16/r2_clientside_qweb/__init__.py
similarity index 100%
rename from Chapter14/r4_tests/__init__.py
rename to Chapter16/r2_clientside_qweb/__init__.py
diff --git a/Chapter14/r2_clientside_qweb/__manifest__.py b/Chapter16/r2_clientside_qweb/__manifest__.py
similarity index 100%
rename from Chapter14/r2_clientside_qweb/__manifest__.py
rename to Chapter16/r2_clientside_qweb/__manifest__.py
diff --git a/Chapter14/r2_clientside_qweb/static/src/css/r2_clientside_qweb.css b/Chapter16/r2_clientside_qweb/static/src/css/r2_clientside_qweb.css
similarity index 100%
rename from Chapter14/r2_clientside_qweb/static/src/css/r2_clientside_qweb.css
rename to Chapter16/r2_clientside_qweb/static/src/css/r2_clientside_qweb.css
diff --git a/Chapter14/r2_clientside_qweb/static/src/js/r2_clientside_qweb.js b/Chapter16/r2_clientside_qweb/static/src/js/r2_clientside_qweb.js
similarity index 100%
rename from Chapter14/r2_clientside_qweb/static/src/js/r2_clientside_qweb.js
rename to Chapter16/r2_clientside_qweb/static/src/js/r2_clientside_qweb.js
diff --git a/Chapter14/r2_clientside_qweb/static/src/xml/r2_clientside_qweb.xml b/Chapter16/r2_clientside_qweb/static/src/xml/r2_clientside_qweb.xml
similarity index 100%
rename from Chapter14/r2_clientside_qweb/static/src/xml/r2_clientside_qweb.xml
rename to Chapter16/r2_clientside_qweb/static/src/xml/r2_clientside_qweb.xml
diff --git a/Chapter14/r2_clientside_qweb/views/res_partner.xml b/Chapter16/r2_clientside_qweb/views/res_partner.xml
similarity index 100%
rename from Chapter14/r2_clientside_qweb/views/res_partner.xml
rename to Chapter16/r2_clientside_qweb/views/res_partner.xml
diff --git a/Chapter14/r2_clientside_qweb/views/templates.xml b/Chapter16/r2_clientside_qweb/views/templates.xml
similarity index 100%
rename from Chapter14/r2_clientside_qweb/views/templates.xml
rename to Chapter16/r2_clientside_qweb/views/templates.xml
diff --git a/Chapter16/r1_css_js/__init__.py b/Chapter16/r3_rpc_calls/__init__.py
similarity index 100%
rename from Chapter16/r1_css_js/__init__.py
rename to Chapter16/r3_rpc_calls/__init__.py
diff --git a/Chapter14/r3_rpc_calls/__manifest__.py b/Chapter16/r3_rpc_calls/__manifest__.py
similarity index 100%
rename from Chapter14/r3_rpc_calls/__manifest__.py
rename to Chapter16/r3_rpc_calls/__manifest__.py
diff --git a/Chapter14/r3_rpc_calls/static/src/css/r3_rpc_calls.css b/Chapter16/r3_rpc_calls/static/src/css/r3_rpc_calls.css
similarity index 100%
rename from Chapter14/r3_rpc_calls/static/src/css/r3_rpc_calls.css
rename to Chapter16/r3_rpc_calls/static/src/css/r3_rpc_calls.css
diff --git a/Chapter14/r3_rpc_calls/static/src/js/r3_rpc_calls.js b/Chapter16/r3_rpc_calls/static/src/js/r3_rpc_calls.js
similarity index 100%
rename from Chapter14/r3_rpc_calls/static/src/js/r3_rpc_calls.js
rename to Chapter16/r3_rpc_calls/static/src/js/r3_rpc_calls.js
diff --git a/Chapter14/r3_rpc_calls/static/src/xml/r3_rpc_calls.xml b/Chapter16/r3_rpc_calls/static/src/xml/r3_rpc_calls.xml
similarity index 100%
rename from Chapter14/r3_rpc_calls/static/src/xml/r3_rpc_calls.xml
rename to Chapter16/r3_rpc_calls/static/src/xml/r3_rpc_calls.xml
diff --git a/Chapter14/r3_rpc_calls/views/res_partner.xml b/Chapter16/r3_rpc_calls/views/res_partner.xml
similarity index 100%
rename from Chapter14/r3_rpc_calls/views/res_partner.xml
rename to Chapter16/r3_rpc_calls/views/res_partner.xml
diff --git a/Chapter14/r3_rpc_calls/views/templates.xml b/Chapter16/r3_rpc_calls/views/templates.xml
similarity index 100%
rename from Chapter14/r3_rpc_calls/views/templates.xml
rename to Chapter16/r3_rpc_calls/views/templates.xml
diff --git a/Chapter16/r3_snippets/__init__.py b/Chapter16/r4_tests/__init__.py
similarity index 100%
rename from Chapter16/r3_snippets/__init__.py
rename to Chapter16/r4_tests/__init__.py
diff --git a/Chapter14/r4_tests/__openerp__.py b/Chapter16/r4_tests/__openerp__.py
similarity index 100%
rename from Chapter14/r4_tests/__openerp__.py
rename to Chapter16/r4_tests/__openerp__.py
diff --git a/Chapter14/r4_tests/static/src/css/r4_tests.css b/Chapter16/r4_tests/static/src/css/r4_tests.css
similarity index 100%
rename from Chapter14/r4_tests/static/src/css/r4_tests.css
rename to Chapter16/r4_tests/static/src/css/r4_tests.css
diff --git a/Chapter14/r4_tests/static/src/js/r4_tests.js b/Chapter16/r4_tests/static/src/js/r4_tests.js
similarity index 100%
rename from Chapter14/r4_tests/static/src/js/r4_tests.js
rename to Chapter16/r4_tests/static/src/js/r4_tests.js
diff --git a/Chapter14/r4_tests/static/src/xml/r4_tests.xml b/Chapter16/r4_tests/static/src/xml/r4_tests.xml
similarity index 100%
rename from Chapter14/r4_tests/static/src/xml/r4_tests.xml
rename to Chapter16/r4_tests/static/src/xml/r4_tests.xml
diff --git a/Chapter14/r4_tests/static/test/r4_tests.js b/Chapter16/r4_tests/static/test/r4_tests.js
similarity index 100%
rename from Chapter14/r4_tests/static/test/r4_tests.js
rename to Chapter16/r4_tests/static/test/r4_tests.js
diff --git a/Chapter14/r4_tests/views/res_partner.xml b/Chapter16/r4_tests/views/res_partner.xml
similarity index 100%
rename from Chapter14/r4_tests/views/res_partner.xml
rename to Chapter16/r4_tests/views/res_partner.xml
diff --git a/Chapter14/r4_tests/views/templates.xml b/Chapter16/r4_tests/views/templates.xml
similarity index 100%
rename from Chapter14/r4_tests/views/templates.xml
rename to Chapter16/r4_tests/views/templates.xml