From 4029e9799ba40d4a0b356e4fcebb9639838225b8 Mon Sep 17 00:00:00 2001
From: spo <sergey.pokhodenko@opencascade.com>
Date: Tue, 29 Dec 2015 11:37:59 +0300
Subject: [PATCH] Issue #803: Put all the python modules in the same python
 package newgeom

---
 CMakeCommon/UnitTest.cmake                    |  2 +-
 CMakeLists.txt                                |  4 +
 env_linux.sh                                  |  8 +-
 src/Config/plugins.xml.in                     |  4 +-
 src/ConnectorPlugin/CMakeLists.txt            |  3 +-
 src/PythonAPI/CMakeLists.txt                  | 10 ++-
 src/PythonAPI/Test/TestFeatures.py            |  2 +-
 src/PythonAPI/Test/TestFeaturesExtrusion.py   |  2 +-
 src/PythonAPI/Test/TestFeaturesRevolution.py  | 20 ++---
 src/PythonAPI/Test/TestMakeBrick1.py          |  6 +-
 src/PythonAPI/Test/TestMakeBrick2.py          |  6 +-
 src/PythonAPI/Test/TestMakeBrick3.py          |  6 +-
 src/PythonAPI/Test/TestModel.py               |  2 +-
 src/PythonAPI/Test/TestPlatine.py             |  6 +-
 src/PythonAPI/Test/TestPythonAPI.py           |  4 +-
 src/PythonAPI/Test/TestSketcher.py            |  2 +-
 src/PythonAPI/Test/TestSketcherAddArc.py      |  9 +-
 src/PythonAPI/Test/TestSketcherAddCircle.py   |  2 +-
 src/PythonAPI/Test/TestSketcherAddLine.py     |  2 +-
 src/PythonAPI/Test/TestSketcherAddMirror.py   |  2 +-
 src/PythonAPI/Test/TestSketcherAddPoint.py    |  2 +-
 src/PythonAPI/Test/TestSketcherSetAngle.py    |  2 +-
 .../Test/TestSketcherSetCoincident.py         |  2 +-
 src/PythonAPI/Test/TestSketcherSetEqual.py    |  2 +-
 src/PythonAPI/Test/TestSketcherSetFillet.py   |  2 +-
 .../Test/TestSketcherSetHorizontal.py         |  2 +-
 src/PythonAPI/Test/TestSketcherSetLength.py   |  2 +-
 src/PythonAPI/Test/TestSketcherSetParallel.py |  2 +-
 .../Test/TestSketcherSetPerpendicular.py      |  2 +-
 src/PythonAPI/Test/TestSketcherSetRadius.py   |  2 +-
 src/PythonAPI/Test/TestSketcherSetRigid.py    |  2 +-
 src/PythonAPI/Test/TestSketcherSetTangent.py  |  2 +-
 src/PythonAPI/Test/TestSketcherSetVertical.py |  2 +-
 src/PythonAPI/Test/config.py.in               |  2 +
 src/PythonAPI/{shaper.py => __init__.py}      |  4 +-
 src/PythonAPI/examples/MakeBrick1.py          | 87 ++++++++++---------
 src/PythonAPI/examples/MakeBrick2.py          | 79 +++++++++--------
 src/PythonAPI/examples/MakeBrick3.py          | 24 ++---
 src/PythonAPI/examples/Platine.py             | 59 +++++++------
 src/PythonAPI/examples/__init__.py            |  4 +
 src/PythonAPI/extension/box.py                |  4 +-
 src/PythonAPI/model/connection/connection.py  |  2 +-
 src/PythonAPI/model/construction/axis.py      |  2 +-
 src/PythonAPI/model/construction/plane.py     |  2 +-
 src/PythonAPI/model/construction/point.py     |  2 +-
 src/PythonAPI/model/exchange/exchange.py      |  2 +-
 src/PythonAPI/model/features/boolean.py       | 20 ++---
 src/PythonAPI/model/features/extrusion.py     |  8 +-
 src/PythonAPI/model/features/group.py         |  2 +-
 src/PythonAPI/model/features/partition.py     |  2 +-
 src/PythonAPI/model/features/placement.py     |  2 +-
 src/PythonAPI/model/features/revolution.py    |  2 +-
 src/PythonAPI/model/features/roots.py         |  2 +-
 src/PythonAPI/model/features/rotation.py      |  2 +-
 src/PythonAPI/model/features/translation.py   |  2 +-
 src/PythonAPI/model/parameter/parameter.py    |  2 +-
 src/PythonAPI/model/partset/part.py           |  2 +-
 src/PythonAPI/model/roots.py                  |  2 +-
 src/PythonAPI/model/services.py               |  2 +-
 src/PythonAPI/model/sketcher/arc.py           |  4 +-
 src/PythonAPI/model/sketcher/circle.py        | 18 ++--
 src/PythonAPI/model/sketcher/entity.py        |  2 +-
 src/PythonAPI/model/sketcher/line.py          |  4 +-
 src/PythonAPI/model/sketcher/mirror.py        |  6 +-
 src/PythonAPI/model/sketcher/point.py         |  6 +-
 src/PythonAPI/model/sketcher/sketch.py        | 16 ++--
 src/PythonAPI/plugins/__init__.py             |  0
 src/PythonAddons/CMakeLists.txt               | 12 ++-
 src/PythonAddons/addons_Features.py           |  2 +-
 src/PythonAddons/addons_Features.xml          |  3 -
 src/PythonAddons/addons_Features.xml.in       |  3 +
 src/PythonAddons/macros/box/feature.py        |  4 +-
 72 files changed, 293 insertions(+), 238 deletions(-)
 create mode 100644 src/PythonAPI/Test/config.py.in
 rename src/PythonAPI/{shaper.py => __init__.py} (66%)
 create mode 100644 src/PythonAPI/plugins/__init__.py
 delete mode 100644 src/PythonAddons/addons_Features.xml
 create mode 100644 src/PythonAddons/addons_Features.xml.in

diff --git a/CMakeCommon/UnitTest.cmake b/CMakeCommon/UnitTest.cmake
index 57dc29246..1f08bf620 100644
--- a/CMakeCommon/UnitTest.cmake
+++ b/CMakeCommon/UnitTest.cmake
@@ -35,7 +35,7 @@ MACRO(ADD_UNIT_TESTS)
     STRING(REPLACE ";" "\\;" _PYTHONPATH "${_PYTHONPATH}")
   else()
     SET(_LD_LIBRARY_PATH "${CMAKE_INSTALL_PREFIX}/bin:${CMAKE_INSTALL_PREFIX}/swig:${CMAKE_INSTALL_PREFIX}/plugins:${SUIT_LIB_DIR}:$ENV{LD_LIBRARY_PATH}")
-    SET(_PYTHONPATH "${CMAKE_INSTALL_PREFIX}/swig:${CMAKE_INSTALL_PREFIX}/plugins:${CMAKE_INSTALL_PREFIX}/addons:${CMAKE_INSTALL_PREFIX}/pythonAPI:$ENV{PYTHONPATH}")
+    SET(_PYTHONPATH "${CMAKE_BINARY_DIR}:${CMAKE_INSTALL_PREFIX}/swig:${CMAKE_INSTALL_PREFIX}/pythonAPI:$ENV{PYTHONPATH}")
   endif()
 
   SET(_CONFIG_FILE "${CMAKE_INSTALL_PREFIX}/plugins")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 53d9986e9..c13ebd35a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -38,6 +38,10 @@ IF(UNIX)
   ENDIF(CMAKE_COMPILER_IS_GNUCC)
 ENDIF(UNIX)
 
+SET (PYTHON_PACKAGE_NAME shaper)
+#SET (PYTHON_PACKAGE_NAME openparts)
+SET (PYTHONAPI_DIR PythonAPI/${PYTHON_PACKAGE_NAME})
+
 #IF(CMAKE_BUILD_TYPE MATCHES Release)
 ADD_SUBDIRECTORY (doc)
 #ENDIF(CMAKE_BUILD_TYPE MATCHES Release)
diff --git a/env_linux.sh b/env_linux.sh
index 2aaa7dbbd..84f66d49c 100644
--- a/env_linux.sh
+++ b/env_linux.sh
@@ -53,7 +53,13 @@ export PATH=${CASROOT}:${PATH}
 
 #------ NewGEOM ------
 export PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/plugins:${PATH}
-export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${NEWGEOM_ROOT_DIR}/addons:${NEWGEOM_ROOT_DIR}/PythonAPI:${PYTHONPATH}
+
+export PYTHONPATH=${NEWGEOM_ROOT_DIR}/swig:${PYTHONPATH}
+#export PYTHONPATH=${NEWGEOM_ROOT_DIR}/plugins:${PYTHONPATH}
+#export PYTHONPATH=${NEWGEOM_ROOT_DIR}/addons:${PYTHONPATH}
+export PYTHONPATH=${NEWGEOM_ROOT_DIR}/PythonAPI:${PYTHONPATH}
+
 export LD_LIBRARY_PATH=${NEWGEOM_ROOT_DIR}/bin:${NEWGEOM_ROOT_DIR}/swig:${NEWGEOM_ROOT_DIR}/plugins:${LD_LIBRARY_PATH}
 export NEW_GEOM_CONFIG_FILE=${NEWGEOM_ROOT_DIR}/plugins
 export NewGeomResources=${NEWGEOM_ROOT_DIR}/resources
+
diff --git a/src/Config/plugins.xml.in b/src/Config/plugins.xml.in
index af91d8fb2..2251b6106 100644
--- a/src/Config/plugins.xml.in
+++ b/src/Config/plugins.xml.in
@@ -8,8 +8,8 @@
   <plugin library="ConstructionPlugin" configuration="plugin-Construction.xml"/>
   <plugin library="FeaturesPlugin" configuration="plugin-Features.xml"/>
   <plugin library="ExchangePlugin" configuration="plugin-Exchange.xml"/>
-  <plugin script="addons_Features" configuration="addons_Features.xml"/>
-  <plugin script="ConnectorPlugin" configuration="plugin-Connector.xml" dependency="Geometry"/>
+  <plugin script="@PYTHON_PACKAGE_NAME@.plugins.addons_Features" configuration="addons_Features.xml"/>
+  <plugin script="@PYTHON_PACKAGE_NAME@.plugins.ConnectorPlugin" configuration="plugin-Connector.xml" dependency="Geometry"/>
   <plugin library="ParametersPlugin" configuration="plugin-Parameters.xml"/>
 @DEFAULT_SOLVER@
 <!--
diff --git a/src/ConnectorPlugin/CMakeLists.txt b/src/ConnectorPlugin/CMakeLists.txt
index 9aafdea5a..82dab93b4 100644
--- a/src/ConnectorPlugin/CMakeLists.txt
+++ b/src/ConnectorPlugin/CMakeLists.txt
@@ -11,4 +11,5 @@ SET(XML_RESSOURCES
 
 ADD_CUSTOM_TARGET(ConnectorPlugin SOURCES ${PYTHON_FILES} ${XML_RESSOURCES})
 
-INSTALL(FILES ${PYTHON_FILES} ${XML_RESSOURCES} DESTINATION plugins)
+INSTALL(FILES ${PYTHON_FILES} DESTINATION ${PYTHONAPI_DIR}/plugins)
+INSTALL(FILES ${XML_RESSOURCES} DESTINATION plugins)
diff --git a/src/PythonAPI/CMakeLists.txt b/src/PythonAPI/CMakeLists.txt
index 33337d6e3..d9b9cd3a7 100644
--- a/src/PythonAPI/CMakeLists.txt
+++ b/src/PythonAPI/CMakeLists.txt
@@ -3,8 +3,14 @@
 
 SET(CMAKE_AUTOMOC ON)
 
-INSTALL(DIRECTORY extension geom model examples DESTINATION PythonAPI)
-INSTALL(FILES shaper.py DESTINATION PythonAPI)
+# configuration
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/Test/config.py.in"
+  "${CMAKE_BINARY_DIR}/config.py"
+  )
+
+INSTALL(DIRECTORY extension geom model examples plugins DESTINATION ${PYTHONAPI_DIR})
+INSTALL(FILES __init__.py DESTINATION ${PYTHONAPI_DIR})
 
 # --------- Unit tests -----------
 INCLUDE(UnitTest)
diff --git a/src/PythonAPI/Test/TestFeatures.py b/src/PythonAPI/Test/TestFeatures.py
index e043fe9da..685ad788e 100644
--- a/src/PythonAPI/Test/TestFeatures.py
+++ b/src/PythonAPI/Test/TestFeatures.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 
-import model
+from config import model
 
 #-----------------------------------------------------------------------------
 # Fixtures
diff --git a/src/PythonAPI/Test/TestFeaturesExtrusion.py b/src/PythonAPI/Test/TestFeaturesExtrusion.py
index decd198b7..4455d2acc 100644
--- a/src/PythonAPI/Test/TestFeaturesExtrusion.py
+++ b/src/PythonAPI/Test/TestFeaturesExtrusion.py
@@ -2,7 +2,7 @@ import unittest
 
 import ModelAPI
 
-import model
+from config import model
 
 #-----------------------------------------------------------------------------
 # Fixtures
diff --git a/src/PythonAPI/Test/TestFeaturesRevolution.py b/src/PythonAPI/Test/TestFeaturesRevolution.py
index a7fbfde5a..0facbd9f2 100644
--- a/src/PythonAPI/Test/TestFeaturesRevolution.py
+++ b/src/PythonAPI/Test/TestFeaturesRevolution.py
@@ -2,8 +2,8 @@ import unittest
 
 import ModelAPI
 
-import model
-from model.tools import Selection
+from config import model
+# from config.model.tools import Selection
 
 #-----------------------------------------------------------------------------
 # Fixtures
@@ -37,8 +37,8 @@ class FeaturesRevolutionFixture(FeaturesAddRevolutionFixture):
         model.do()
 
         base = base_sketch.selectFace(circle.lastResult())
-        axis_object = Selection(axis_sketch.firstResult(),
-                                line.firstResult().shape())
+        axis_object = model.Selection(axis_sketch.firstResult(),
+                                      line.firstResult().shape())
 
         self.revolution = model.addRevolution(self.part, base, axis_object,
                                               0, 180)
@@ -71,8 +71,8 @@ class FeaturesAddRevolutionTestCase(FeaturesAddRevolutionFixture):
         model.do()
 
         base = base_sketch.selectFace(circle.lastResult())
-        axis_object = Selection(axis_sketch.firstResult(),
-                                line.firstResult().shape())
+        axis_object = model.Selection(axis_sketch.firstResult(),
+                                      line.firstResult().shape())
 
         revolution = model.addRevolution(self.part, base, axis_object,
                                          0, 180)
@@ -106,8 +106,8 @@ class FeaturesAddRevolutionTestCase(FeaturesAddRevolutionFixture):
         model.do()
 
         base = base_sketch.selectFace(base_circle.result())
-        axis_object = Selection(axis_sketch.firstResult(),
-                                line.firstResult().shape())
+        axis_object = model.Selection(axis_sketch.firstResult(),
+                                      line.firstResult().shape())
         to_obejct = to_sketch.selectFace(to_circle.result())[0]
         from_object = from_sketch.selectFace(from_circle.result())[0]
 
@@ -184,8 +184,8 @@ class FeaturesRevolutionTestCase(FeaturesRevolutionFixture):
         model.do()
 
         base = base_sketch.selectFace(base_circle.result())
-        axis_object = Selection(axis_sketch.firstResult(),
-                                line.firstResult().shape())
+        axis_object = model.Selection(axis_sketch.firstResult(),
+                                      line.firstResult().shape())
         to_obejct = to_sketch.selectFace(to_circle.result())[0]
         from_object = from_sketch.selectFace(from_circle.result())[0]
 
diff --git a/src/PythonAPI/Test/TestMakeBrick1.py b/src/PythonAPI/Test/TestMakeBrick1.py
index 2225919c0..48eeab641 100644
--- a/src/PythonAPI/Test/TestMakeBrick1.py
+++ b/src/PythonAPI/Test/TestMakeBrick1.py
@@ -1,6 +1,10 @@
 import unittest
 
-import examples.MakeBrick1
+from config import examples
+
+class MakeBrick1TestCase(unittest.TestCase):
+    def test_main(self):
+        examples.MakeBrick1.main()
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/PythonAPI/Test/TestMakeBrick2.py b/src/PythonAPI/Test/TestMakeBrick2.py
index 21ea7263e..8b7ee4c33 100644
--- a/src/PythonAPI/Test/TestMakeBrick2.py
+++ b/src/PythonAPI/Test/TestMakeBrick2.py
@@ -1,6 +1,10 @@
 import unittest
 
-import examples.MakeBrick2
+from config import examples
+
+class MakeBrick2TestCase(unittest.TestCase):
+    def test_main(self):
+        examples.MakeBrick2.main()
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/PythonAPI/Test/TestMakeBrick3.py b/src/PythonAPI/Test/TestMakeBrick3.py
index bbdb4a989..d212b981b 100644
--- a/src/PythonAPI/Test/TestMakeBrick3.py
+++ b/src/PythonAPI/Test/TestMakeBrick3.py
@@ -1,6 +1,10 @@
 import unittest
 
-import examples.MakeBrick3
+from config import examples
+
+class MakeBrick3TestCase(unittest.TestCase):
+    def test_main(self):
+        examples.MakeBrick3.main()
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/PythonAPI/Test/TestModel.py b/src/PythonAPI/Test/TestModel.py
index d76377736..61f20c235 100644
--- a/src/PythonAPI/Test/TestModel.py
+++ b/src/PythonAPI/Test/TestModel.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 
 class ModelTestCase(unittest.TestCase):
     def setUp(self):
diff --git a/src/PythonAPI/Test/TestPlatine.py b/src/PythonAPI/Test/TestPlatine.py
index 498be7750..3af7d623b 100644
--- a/src/PythonAPI/Test/TestPlatine.py
+++ b/src/PythonAPI/Test/TestPlatine.py
@@ -1,6 +1,10 @@
 import unittest
 
-import examples.Platine
+from config import examples
+
+class PlatineTestCase(unittest.TestCase):
+    def test_main(self):
+        examples.Platine.main()
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/PythonAPI/Test/TestPythonAPI.py b/src/PythonAPI/Test/TestPythonAPI.py
index e1fe33712..3d633f9ea 100644
--- a/src/PythonAPI/Test/TestPythonAPI.py
+++ b/src/PythonAPI/Test/TestPythonAPI.py
@@ -1,6 +1,6 @@
 import unittest
-import model
-import geom
+from config import model
+from config import geom
 
 if __name__ == "__main__":
     unittest.main()
diff --git a/src/PythonAPI/Test/TestSketcher.py b/src/PythonAPI/Test/TestSketcher.py
index 826493a48..930344e73 100644
--- a/src/PythonAPI/Test/TestSketcher.py
+++ b/src/PythonAPI/Test/TestSketcher.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 
 # Delta value for almost equal comparisons
 DELTA = 1e-10
diff --git a/src/PythonAPI/Test/TestSketcherAddArc.py b/src/PythonAPI/Test/TestSketcherAddArc.py
index 5899815e8..99c4984e8 100644
--- a/src/PythonAPI/Test/TestSketcherAddArc.py
+++ b/src/PythonAPI/Test/TestSketcherAddArc.py
@@ -1,8 +1,7 @@
 import unittest
 
-import model
-import geom
-from model import WrongNumberOfArguments
+from config import model
+from config import geom
 
 from TestSketcher import SketcherTestCase
 
@@ -23,9 +22,9 @@ class SketcherAddArc(SketcherTestCase):
         self.assertEqual(arc.startPoint().y(), 0)
 
     def test_number_of_args(self):
-        with self.assertRaises(WrongNumberOfArguments):
+        with self.assertRaises(model.WrongNumberOfArguments):
             self.sketch.addArc(0, 1, 1, 1)
-        with self.assertRaises(WrongNumberOfArguments):
+        with self.assertRaises(model.WrongNumberOfArguments):
             self.sketch.addArc(0, 1)
 
     def test_modify_arc(self):
diff --git a/src/PythonAPI/Test/TestSketcherAddCircle.py b/src/PythonAPI/Test/TestSketcherAddCircle.py
index 9bc6e4c9d..e1c881e67 100644
--- a/src/PythonAPI/Test/TestSketcherAddCircle.py
+++ b/src/PythonAPI/Test/TestSketcherAddCircle.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherAddCircle(SketcherTestCase):    
diff --git a/src/PythonAPI/Test/TestSketcherAddLine.py b/src/PythonAPI/Test/TestSketcherAddLine.py
index fa4ed94c6..660dd76e5 100644
--- a/src/PythonAPI/Test/TestSketcherAddLine.py
+++ b/src/PythonAPI/Test/TestSketcherAddLine.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherAddLine(SketcherTestCase):    
diff --git a/src/PythonAPI/Test/TestSketcherAddMirror.py b/src/PythonAPI/Test/TestSketcherAddMirror.py
index 8fc614670..469c02cf5 100644
--- a/src/PythonAPI/Test/TestSketcherAddMirror.py
+++ b/src/PythonAPI/Test/TestSketcherAddMirror.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 from ModelAPI import *
 from GeomDataAPI import geomDataAPI_Point2D
diff --git a/src/PythonAPI/Test/TestSketcherAddPoint.py b/src/PythonAPI/Test/TestSketcherAddPoint.py
index 284d37764..91d98210d 100644
--- a/src/PythonAPI/Test/TestSketcherAddPoint.py
+++ b/src/PythonAPI/Test/TestSketcherAddPoint.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherAddPoint(SketcherTestCase):    
diff --git a/src/PythonAPI/Test/TestSketcherSetAngle.py b/src/PythonAPI/Test/TestSketcherSetAngle.py
index 7dd937902..ddcb2686d 100644
--- a/src/PythonAPI/Test/TestSketcherSetAngle.py
+++ b/src/PythonAPI/Test/TestSketcherSetAngle.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase
diff --git a/src/PythonAPI/Test/TestSketcherSetCoincident.py b/src/PythonAPI/Test/TestSketcherSetCoincident.py
index 8f75d1393..5c2424855 100644
--- a/src/PythonAPI/Test/TestSketcherSetCoincident.py
+++ b/src/PythonAPI/Test/TestSketcherSetCoincident.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetCoincident(SketcherTestCase):   
diff --git a/src/PythonAPI/Test/TestSketcherSetEqual.py b/src/PythonAPI/Test/TestSketcherSetEqual.py
index 9ffdb8774..556332596 100644
--- a/src/PythonAPI/Test/TestSketcherSetEqual.py
+++ b/src/PythonAPI/Test/TestSketcherSetEqual.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase
diff --git a/src/PythonAPI/Test/TestSketcherSetFillet.py b/src/PythonAPI/Test/TestSketcherSetFillet.py
index b6e90ea9c..15b23c374 100644
--- a/src/PythonAPI/Test/TestSketcherSetFillet.py
+++ b/src/PythonAPI/Test/TestSketcherSetFillet.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetFillet(SketcherTestCase):   
diff --git a/src/PythonAPI/Test/TestSketcherSetHorizontal.py b/src/PythonAPI/Test/TestSketcherSetHorizontal.py
index 1f0ee545c..0912f2a0d 100644
--- a/src/PythonAPI/Test/TestSketcherSetHorizontal.py
+++ b/src/PythonAPI/Test/TestSketcherSetHorizontal.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetHorizontal(SketcherTestCase):   
diff --git a/src/PythonAPI/Test/TestSketcherSetLength.py b/src/PythonAPI/Test/TestSketcherSetLength.py
index bbbcab6dd..54650630b 100644
--- a/src/PythonAPI/Test/TestSketcherSetLength.py
+++ b/src/PythonAPI/Test/TestSketcherSetLength.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 import math
 import TestSketcher
 from TestSketcher import SketcherTestCase
diff --git a/src/PythonAPI/Test/TestSketcherSetParallel.py b/src/PythonAPI/Test/TestSketcherSetParallel.py
index 75c37ecc3..b4271d5c6 100644
--- a/src/PythonAPI/Test/TestSketcherSetParallel.py
+++ b/src/PythonAPI/Test/TestSketcherSetParallel.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetParallel(SketcherTestCase):   
diff --git a/src/PythonAPI/Test/TestSketcherSetPerpendicular.py b/src/PythonAPI/Test/TestSketcherSetPerpendicular.py
index 766fc5057..c6d922b33 100644
--- a/src/PythonAPI/Test/TestSketcherSetPerpendicular.py
+++ b/src/PythonAPI/Test/TestSketcherSetPerpendicular.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 import TestSketcher
 from TestSketcher import SketcherTestCase
 
diff --git a/src/PythonAPI/Test/TestSketcherSetRadius.py b/src/PythonAPI/Test/TestSketcherSetRadius.py
index 0cb6ad9a0..eeb9a6087 100644
--- a/src/PythonAPI/Test/TestSketcherSetRadius.py
+++ b/src/PythonAPI/Test/TestSketcherSetRadius.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetRadius(SketcherTestCase):   
diff --git a/src/PythonAPI/Test/TestSketcherSetRigid.py b/src/PythonAPI/Test/TestSketcherSetRigid.py
index 12e946f03..f640857bf 100644
--- a/src/PythonAPI/Test/TestSketcherSetRigid.py
+++ b/src/PythonAPI/Test/TestSketcherSetRigid.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetRigid(SketcherTestCase):
diff --git a/src/PythonAPI/Test/TestSketcherSetTangent.py b/src/PythonAPI/Test/TestSketcherSetTangent.py
index 135379189..f1d74ebe1 100644
--- a/src/PythonAPI/Test/TestSketcherSetTangent.py
+++ b/src/PythonAPI/Test/TestSketcherSetTangent.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetTangent(SketcherTestCase):
diff --git a/src/PythonAPI/Test/TestSketcherSetVertical.py b/src/PythonAPI/Test/TestSketcherSetVertical.py
index 5128c5b6b..79c7b5868 100644
--- a/src/PythonAPI/Test/TestSketcherSetVertical.py
+++ b/src/PythonAPI/Test/TestSketcherSetVertical.py
@@ -1,5 +1,5 @@
 import unittest
-import model
+from config import model
 from TestSketcher import SketcherTestCase
 
 class SketcherSetVertical(SketcherTestCase):   
diff --git a/src/PythonAPI/Test/config.py.in b/src/PythonAPI/Test/config.py.in
new file mode 100644
index 000000000..bb56b7f62
--- /dev/null
+++ b/src/PythonAPI/Test/config.py.in
@@ -0,0 +1,2 @@
+from @PYTHON_PACKAGE_NAME@ import geom, model
+from @PYTHON_PACKAGE_NAME@ import examples
diff --git a/src/PythonAPI/shaper.py b/src/PythonAPI/__init__.py
similarity index 66%
rename from src/PythonAPI/shaper.py
rename to src/PythonAPI/__init__.py
index b2eb4d419..ae1d89b8e 100644
--- a/src/PythonAPI/shaper.py
+++ b/src/PythonAPI/__init__.py
@@ -3,5 +3,5 @@
 
 # Main packages
 
-import geom
-import model
+from . import geom
+from . import model
diff --git a/src/PythonAPI/examples/MakeBrick1.py b/src/PythonAPI/examples/MakeBrick1.py
index 3f7d6fbbc..22126d8c8 100644
--- a/src/PythonAPI/examples/MakeBrick1.py
+++ b/src/PythonAPI/examples/MakeBrick1.py
@@ -2,71 +2,74 @@
 # Author: Daniel Brunier-Coulin
 # -----------------------------
 
-import model
+from .. import model
 
+def main():
+    # Initialisation
 
-# Initialisation
+    model.begin()
+    mypartset = model.moduleDocument()
 
-model.begin()
-mypartset = model.moduleDocument()
 
+    # Creating a new Part
 
-# Creating a new Part
+    mypart = model.addPart(mypartset).document()
 
-mypart = model.addPart(mypartset).document()
 
+    # Creating the base of the box
 
-# Creating the base of the box
+    mybase = model.addSketch(mypart, model.defaultPlane("XOY"))
 
-mybase = model.addSketch(mypart, model.defaultPlane("XOY"))
+    l1 = mybase.addLine(0, 0, 0, 1)
+    l2 = mybase.addLine(0, 1, 1, 1)
+    l3 = mybase.addLine(1, 1, 1, 0)
+    l4 = mybase.addLine(1, 0, 0, 0)
 
-l1 = mybase.addLine(0, 0, 0, 1)
-l2 = mybase.addLine(0, 1, 1, 1)
-l3 = mybase.addLine(1, 1, 1, 0)
-l4 = mybase.addLine(1, 0, 0, 0)
+    mybase.setCoincident(l1.endPoint(), l2.startPoint())
+    mybase.setCoincident(l2.endPoint(), l3.startPoint())
+    mybase.setCoincident(l3.endPoint(), l4.startPoint())
+    mybase.setCoincident(l4.endPoint(), l1.startPoint())
 
-mybase.setCoincident(l1.endPoint(), l2.startPoint())
-mybase.setCoincident(l2.endPoint(), l3.startPoint())
-mybase.setCoincident(l3.endPoint(), l4.startPoint())
-mybase.setCoincident(l4.endPoint(), l1.startPoint())
+    mybase.setParallel(l1.result(), l3.result())
+    mybase.setParallel(l2.result(), l4.result())
 
-mybase.setParallel(l1.result(), l3.result())
-mybase.setParallel(l2.result(), l4.result())
+    mybase.setPerpendicular(l1.result(), l4.result())
 
-mybase.setPerpendicular(l1.result(), l4.result())
+    mywidth = mybase.setLength(l1.result(), 50)
+    mylength = mybase.setDistance(l1.startPoint(), l3.result(), 50)
 
-mywidth = mybase.setLength(l1.result(), 50)
-mylength = mybase.setDistance(l1.startPoint(), l3.result(), 50)
+    # Creating the extrusion
 
-# Creating the extrusion
+    mybox = model.addExtrusion(mypart, mybase.selectFace(), 50)
 
-mybox = model.addExtrusion(mypart, mybase.selectFace(), 50)
+    # Creating a cylinder on a face of the box
 
-# Creating a cylinder on a face of the box
+    thisface = "Extrusion_1_1/LateralFace_2"
+    thisxmin = "Extrusion_1_1/LateralFace_3&Extrusion_1_1/LateralFace_2"
+    thisxmax = "Extrusion_1_1/LateralFace_2&Extrusion_1_1/LateralFace_1"
+    thiszmin = "Sketch_1/Edge5_1"
+    thiszmax = "Extrusion_1_1/LateralFace_2&Extrusion_1_1/ToFace_1"
 
-thisface = "Extrusion_1_1/LateralFace_2"
-thisxmin = "Extrusion_1_1/LateralFace_3&Extrusion_1_1/LateralFace_2"
-thisxmax = "Extrusion_1_1/LateralFace_2&Extrusion_1_1/LateralFace_1"
-thiszmin = "Sketch_1/Edge5_1"
-thiszmax = "Extrusion_1_1/LateralFace_2&Extrusion_1_1/ToFace_1"
+    mystand = model.addSketch(mypart, thisface)
 
-mystand = model.addSketch(mypart, thisface)
+    c1 = mystand.addCircle(0, 25, 5)
+    mystand.setDistance(c1.center(), thisxmin, 10)
+    mystand.setDistance(c1.center(), thiszmax, 10)
 
-c1 = mystand.addCircle(0, 25, 5)
-mystand.setDistance(c1.center(), thisxmin, 10)
-mystand.setDistance(c1.center(), thiszmax, 10)
+    myboss = model.addExtrusion(mypart, mystand.selectFace(c1.result()), -5)
 
-myboss = model.addExtrusion(mypart, mystand.selectFace(c1.result()), -5)
+    # Subtracting the cylinder to the box
 
-# Subtracting the cylinder to the box
+    model.addSubtraction(mypart, mybox.result(), myboss.result())
+    model.end()
 
-model.addSubtraction(mypart, mybox.result(), myboss.result())
-model.end()
 
+    # Editing the box
 
-# Editing the box
+    model.begin()
+    mybase.setValue(mylength, 100)
+    mybox.setSize(80)
+    model.end()
 
-model.begin()
-mybase.setValue(mylength, 100)
-mybox.setSize(80)
-model.end()
+if __name__ == '__main__':
+    main()
\ No newline at end of file
diff --git a/src/PythonAPI/examples/MakeBrick2.py b/src/PythonAPI/examples/MakeBrick2.py
index 55cc29bbc..1e85357d6 100644
--- a/src/PythonAPI/examples/MakeBrick2.py
+++ b/src/PythonAPI/examples/MakeBrick2.py
@@ -2,68 +2,71 @@
 # Author: Daniel Brunier-Coulin
 # -----------------------------
 
-import model
-import geom
+from .. import model
+from .. import geom
 
+def main():
+    # Initialisation
 
-# Initialisation
+    model.begin()
+    mypartset = model.moduleDocument()
 
-model.begin()
-mypartset = model.moduleDocument()
 
+    # Creating a new Part
 
-# Creating a new Part
+    mypart = model.addPart(mypartset).document()
 
-mypart = model.addPart(mypartset).document()
 
+    # Creating the base of the box
 
-# Creating the base of the box
+    mybase = model.addSketch(mypart, model.defaultPlane("XOY"))
 
-mybase = model.addSketch(mypart, model.defaultPlane("XOY"))
+    p1 = geom.Pnt2d(0, 0)
+    p2 = geom.Pnt2d(0, 1)
+    p3 = geom.Pnt2d(1, 1)
+    p4 = geom.Pnt2d(1, 0)
 
-p1 = geom.Pnt2d(0, 0)
-p2 = geom.Pnt2d(0, 1)
-p3 = geom.Pnt2d(1, 1)
-p4 = geom.Pnt2d(1, 0)
+    line = mybase.addPolygon(p1, p2, p3, p4)
 
-line = mybase.addPolygon(p1, p2, p3, p4)
+    mybase.setParallel(line[0].result(), line[2].result())
+    mybase.setParallel(line[1].result(), line[3].result())
+    mybase.setPerpendicular(line[0].result(), line[3].result())
 
-mybase.setParallel(line[0].result(), line[2].result())
-mybase.setParallel(line[1].result(), line[3].result())
-mybase.setPerpendicular(line[0].result(), line[3].result())
+    mywidth = mybase.setLength(line[0].result(), 50)
+    mylength = mybase.setDistance(line[0].startPoint(), line[2].result(), 50)
 
-mywidth = mybase.setLength(line[0].result(), 50)
-mylength = mybase.setDistance(line[0].startPoint(), line[2].result(), 50)
 
+    # Creating the extrusion
 
-# Creating the extrusion
+    mybox = model.addExtrusion(mypart, mybase.selectFace(), 50)
 
-mybox = model.addExtrusion(mypart, mybase.selectFace(), 50)
 
+    # Creating a cylinder on a face of the box
 
-# Creating a cylinder on a face of the box
+    thisface = "Extrusion_1_1/LateralFace_2"
+    thisxmin = "Extrusion_1_1/LateralFace_3&Extrusion_1_1/LateralFace_2"
+    thiszmax = "Extrusion_1_1/LateralFace_2&Extrusion_1_1/ToFace_1"
 
-thisface = "Extrusion_1_1/LateralFace_2"
-thisxmin = "Extrusion_1_1/LateralFace_3&Extrusion_1_1/LateralFace_2"
-thiszmax = "Extrusion_1_1/LateralFace_2&Extrusion_1_1/ToFace_1"
+    mystand = model.addSketch(mypart, thisface)
+    circle = mystand.addCircle(0, 25, 5)
+    mystand.setDistance(circle.center(), thisxmin, 10)
+    mystand.setDistance(circle.center(), thiszmax, 10)
 
-mystand = model.addSketch(mypart, thisface)
-circle = mystand.addCircle(0, 25, 5)
-mystand.setDistance(circle.center(), thisxmin, 10)
-mystand.setDistance(circle.center(), thiszmax, 10)
+    myboss = model.addExtrusion(mypart, mystand.selectFace(), -5)
 
-myboss = model.addExtrusion(mypart, mystand.selectFace(), -5)
 
+    # Subtracting the cylinder to the box
 
-# Subtracting the cylinder to the box
+    model.addSubtraction(mypart, mybox.result(), myboss.result())
+    model.end()
 
-model.addSubtraction(mypart, mybox.result(), myboss.result())
-model.end()
 
+    # Editing the box
 
-# Editing the box
+    model.begin()
+    mybase.setValue(mylength, 100)
+    mybox.setSize(20)
+    model.end()
 
-model.begin()
-mybase.setValue(mylength, 100)
-mybox.setSize(20)
-model.end()
+if __name__ == '__main__':
+    main()
diff --git a/src/PythonAPI/examples/MakeBrick3.py b/src/PythonAPI/examples/MakeBrick3.py
index 94fa252d2..75932d187 100644
--- a/src/PythonAPI/examples/MakeBrick3.py
+++ b/src/PythonAPI/examples/MakeBrick3.py
@@ -2,23 +2,25 @@
 # Author: Daniel Brunier-Coulin
 # -----------------------------
 
-import model
-import extension
+from .. import model
+from .. import extension
 
+def main():
+    # Initialisation
 
-# Initialisation
+    model.begin()
+    mypartset = model.moduleDocument()
 
-model.begin()
-mypartset = model.moduleDocument()
 
+    # Creating a new Part
 
-# Creating a new Part
+    mypart = model.addPart(mypartset).document()
 
-mypart = model.addPart(mypartset).document()
 
+    # Creating the base of the box
 
-# Creating the base of the box
-
-extension.addBox( mypart, 10, 20, 30 )
-model.end()
+    extension.addBox(mypart, 10, 20, 30)
+    model.end()
 
+if __name__ == '__main__':
+    main()
diff --git a/src/PythonAPI/examples/Platine.py b/src/PythonAPI/examples/Platine.py
index 8a1a3dfca..1dd8e0877 100644
--- a/src/PythonAPI/examples/Platine.py
+++ b/src/PythonAPI/examples/Platine.py
@@ -2,26 +2,14 @@
 # Author: Sergey POKHODENKO
 # -----------------------------
 
-import geom
-import model
-
-# Initialisation
-model.begin()
-partset = model.moduleDocument()
-
-# Create a new Part
-part = model.addPart(partset).document()
+from .. import geom
+from .. import model
 
 L = 64
 E = 16
 P = 80
 
-# Create Parameters
-model.addParameter(part, "L", L)
-model.addParameter(part, "E", E)
-model.addParameter(part, "P", P)
-
-def vertical_body():
+def vertical_body(part):
     # Create YOZ sketch
     sketch = model.addSketch(part, model.defaultPlane("YOZ"))
 
@@ -52,7 +40,7 @@ def vertical_body():
 
     return body
 
-def bottom_body():
+def bottom_body(part):
     # Create XOY sketch
     sketch = model.addSketch(part, "Extrusion_1_1/LateralFace_2")
 
@@ -105,7 +93,7 @@ def bottom_body():
 
     return body
 
-def body_3():
+def body_3(part):
     # Create XOZ sketch
     sketch = model.addSketch(part, "Boolean_1_1/Modified_3")
 
@@ -158,7 +146,7 @@ def body_3():
 
     return body
 
-def body_4():
+def body_4(part):
     # Create XOZ 2nd sketch
     sketch = model.addSketch(part, "Boolean_2_1/Modified_7")
 
@@ -185,19 +173,34 @@ def body_4():
 
     return body
 
+def main():
+    # Initialisation
+    model.begin()
+    partset = model.moduleDocument()
 
-b1 = vertical_body()
-b2 = bottom_body()
+    # Create a new Part
+    part = model.addPart(partset).document()
 
-boolean = model.addAddition(part, b1.result() + b2.result())
-model.do()
+    # Create Parameters
+    model.addParameter(part, "L", L)
+    model.addParameter(part, "E", E)
+    model.addParameter(part, "P", P)
 
-b3 = body_3()
+    b1 = vertical_body(part)
+    b2 = bottom_body(part)
+
+    boolean = model.addAddition(part, b1.result() + b2.result())
+    model.do()
 
-boolean = model.addAddition(part, boolean.result() + b3.result())
-model.do()
+    b3 = body_3(part)
 
-b4 = body_4()
+    boolean = model.addAddition(part, boolean.result() + b3.result())
+    model.do()
+
+    b4 = body_4(part)
+
+    boolean = model.addAddition(part, boolean.result() + b4.result())
+    model.do()
 
-boolean = model.addAddition(part, boolean.result() + b4.result())
-model.do()
+if __name__ == '__main__':
+    main()
diff --git a/src/PythonAPI/examples/__init__.py b/src/PythonAPI/examples/__init__.py
index e69de29bb..8fc0490df 100644
--- a/src/PythonAPI/examples/__init__.py
+++ b/src/PythonAPI/examples/__init__.py
@@ -0,0 +1,4 @@
+import MakeBrick1
+import MakeBrick2
+import MakeBrick3
+import Platine
diff --git a/src/PythonAPI/extension/box.py b/src/PythonAPI/extension/box.py
index c3ef9dcbc..a14999024 100644
--- a/src/PythonAPI/extension/box.py
+++ b/src/PythonAPI/extension/box.py
@@ -3,8 +3,8 @@ Author: Daniel Brunier-Coulin
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model import Interface
-from macros.box.feature import BoxFeature as MY
+from ..model import Interface
+from ..addons.macros.box.feature import BoxFeature as MY
 
 
 def addBox(part, *args):
diff --git a/src/PythonAPI/model/connection/connection.py b/src/PythonAPI/model/connection/connection.py
index da54458bc..df3d2df92 100644
--- a/src/PythonAPI/model/connection/connection.py
+++ b/src/PythonAPI/model/connection/connection.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def exportToGEOM(part):
diff --git a/src/PythonAPI/model/construction/axis.py b/src/PythonAPI/model/construction/axis.py
index ee92f4a37..4580f1272 100644
--- a/src/PythonAPI/model/construction/axis.py
+++ b/src/PythonAPI/model/construction/axis.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addAxis(part, *args):
diff --git a/src/PythonAPI/model/construction/plane.py b/src/PythonAPI/model/construction/plane.py
index c51e53032..077eca4e3 100644
--- a/src/PythonAPI/model/construction/plane.py
+++ b/src/PythonAPI/model/construction/plane.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addPlane(part, *args):
diff --git a/src/PythonAPI/model/construction/point.py b/src/PythonAPI/model/construction/point.py
index db3405fb4..67aa12f8e 100644
--- a/src/PythonAPI/model/construction/point.py
+++ b/src/PythonAPI/model/construction/point.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addPoint(part, *args):
diff --git a/src/PythonAPI/model/exchange/exchange.py b/src/PythonAPI/model/exchange/exchange.py
index c884451af..7c79ccd20 100644
--- a/src/PythonAPI/model/exchange/exchange.py
+++ b/src/PythonAPI/model/exchange/exchange.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addImport(part, *args):
diff --git a/src/PythonAPI/model/features/boolean.py b/src/PythonAPI/model/features/boolean.py
index aab909faa..a4fe4f98c 100644
--- a/src/PythonAPI/model/features/boolean.py
+++ b/src/PythonAPI/model/features/boolean.py
@@ -5,8 +5,8 @@ Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 from GeomAlgoAPI import GeomAlgoAPI_Boolean
 
-from model.roots import Interface
-from model import Selection
+from ...model.roots import Interface
+from ...model import Selection
 
 def addAddition(part, *args):
     """Perform addition in the Part.
@@ -17,8 +17,8 @@ def addAddition(part, *args):
 
     Args:
         part (ModelAPI_Document): part document
-        main_objects (list of :class:`model.Selection`): main objects
-        tool_objects (list of :class:`model.Selection`): (optional) tool_objects objects
+        main_objects (list of :class:`...model.Selection`): main objects
+        tool_objects (list of :class:`...model.Selection`): (optional) tool_objects objects
 
     Returns:
         Boolean: boolean object
@@ -38,8 +38,8 @@ def addSubtraction(part, *args):
 
     Args:
         part (ModelAPI_Document): part document
-        main_objects (list of :class:`model.Selection`): main objects
-        tool_objects (list of :class:`model.Selection`): tool_objects objects
+        main_objects (list of :class:`...model.Selection`): main objects
+        tool_objects (list of :class:`...model.Selection`): tool_objects objects
 
     Returns:
         Boolean: boolean object
@@ -60,8 +60,8 @@ def addIntersection(part, *args):
 
     Args:
         part (ModelAPI_Document): part document
-        main_objects (list of :class:`model.Selection`): main objects
-        tool_objects (list of :class:`model.Selection`): tool_objects objects
+        main_objects (list of :class:`...model.Selection`): main objects
+        tool_objects (list of :class:`...model.Selection`): tool_objects objects
 
     Returns:
         Boolean: boolean object
@@ -122,7 +122,7 @@ class Boolean(Interface):
         """Modify main_objects attribute of the feature.
 
         Args:
-            main_objects (list of :class:`model.Selection`): main objects
+            main_objects (list of :class:`...model.Selection`): main objects
         """
         self._fillAttribute(self._main_objects, main_objects)
         pass
@@ -131,7 +131,7 @@ class Boolean(Interface):
         """Modify tool_objects attribute of the feature.
 
         Args:
-            tool_objects (list of :class:`model.Selection`): tool objects
+            tool_objects (list of :class:`...model.Selection`): tool objects
         """
         self._fillAttribute(self._tool_objects, tool_objects)
         pass
diff --git a/src/PythonAPI/model/features/extrusion.py b/src/PythonAPI/model/features/extrusion.py
index f0cb7c403..2084e5c68 100644
--- a/src/PythonAPI/model/features/extrusion.py
+++ b/src/PythonAPI/model/features/extrusion.py
@@ -4,8 +4,8 @@ Author: Daniel Brunier-Coulin with contribution by Mikhail Ponikarov
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
-from model import Selection
+from ...model.roots import Interface
+from ...model import Selection
 
 def addExtrusion(part, *args):
     """Add an Extrusion feature to the Part and return Extrusion.
@@ -131,10 +131,10 @@ class Extrusion(Interface):
 
         See __init__.
         """
-        # MPV: with "clear" calling here the extrusion all the time becomes modificed (height is set to 
+        # MPV: with "clear" calling here the extrusion all the time becomes modificed (height is set to
         # zero and then to actual value, but this function is used in macro Bax, that causes "modified"
         # values without changes that causes cyclic dependency
-        #self.__clear()
+        # self.__clear()
         self._fillAttribute(self._CreationMethod, "BySizes")
         self._fillAttribute(self._to_size, to_size)
         self._fillAttribute(self._from_size, from_size)
diff --git a/src/PythonAPI/model/features/group.py b/src/PythonAPI/model/features/group.py
index 68567bd2b..0dccb7442 100644
--- a/src/PythonAPI/model/features/group.py
+++ b/src/PythonAPI/model/features/group.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addGroup(part, *args):
diff --git a/src/PythonAPI/model/features/partition.py b/src/PythonAPI/model/features/partition.py
index 26173e0d6..3c1d36783 100644
--- a/src/PythonAPI/model/features/partition.py
+++ b/src/PythonAPI/model/features/partition.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addPartition(part, *args):
diff --git a/src/PythonAPI/model/features/placement.py b/src/PythonAPI/model/features/placement.py
index 4da0998e5..62bcdd1fd 100644
--- a/src/PythonAPI/model/features/placement.py
+++ b/src/PythonAPI/model/features/placement.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addPlacement(part, *args):
diff --git a/src/PythonAPI/model/features/revolution.py b/src/PythonAPI/model/features/revolution.py
index 3ab420144..6bd8c79af 100644
--- a/src/PythonAPI/model/features/revolution.py
+++ b/src/PythonAPI/model/features/revolution.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addRevolution(part, *args):
diff --git a/src/PythonAPI/model/features/roots.py b/src/PythonAPI/model/features/roots.py
index 2aeacfe17..46819ebc1 100644
--- a/src/PythonAPI/model/features/roots.py
+++ b/src/PythonAPI/model/features/roots.py
@@ -1,5 +1,5 @@
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 class CompositeBoolean(Interface):
diff --git a/src/PythonAPI/model/features/rotation.py b/src/PythonAPI/model/features/rotation.py
index 4ec174535..b6560caf3 100644
--- a/src/PythonAPI/model/features/rotation.py
+++ b/src/PythonAPI/model/features/rotation.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addRotation(part, *args):
diff --git a/src/PythonAPI/model/features/translation.py b/src/PythonAPI/model/features/translation.py
index 171c988d4..7723a4244 100644
--- a/src/PythonAPI/model/features/translation.py
+++ b/src/PythonAPI/model/features/translation.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addTranslation(part, *args):
diff --git a/src/PythonAPI/model/parameter/parameter.py b/src/PythonAPI/model/parameter/parameter.py
index 9bc5b5a07..4c57d29f1 100644
--- a/src/PythonAPI/model/parameter/parameter.py
+++ b/src/PythonAPI/model/parameter/parameter.py
@@ -3,7 +3,7 @@ Author: Sergey Pokhodenko
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addParameter(part, *args):
diff --git a/src/PythonAPI/model/partset/part.py b/src/PythonAPI/model/partset/part.py
index 79548308d..a54822bab 100644
--- a/src/PythonAPI/model/partset/part.py
+++ b/src/PythonAPI/model/partset/part.py
@@ -5,7 +5,7 @@ Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 import ModelAPI
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 
 def addPart(partset):
diff --git a/src/PythonAPI/model/roots.py b/src/PythonAPI/model/roots.py
index 5f1c294bf..b4e12b64d 100644
--- a/src/PythonAPI/model/roots.py
+++ b/src/PythonAPI/model/roots.py
@@ -5,7 +5,7 @@ Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 
 import ModelAPI
 
-from model import tools
+from . import tools
 
 
 class Feature(ModelAPI.ModelAPI_Feature):
diff --git a/src/PythonAPI/model/services.py b/src/PythonAPI/model/services.py
index b978bd025..8efbf1750 100644
--- a/src/PythonAPI/model/services.py
+++ b/src/PythonAPI/model/services.py
@@ -6,7 +6,7 @@ Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 import ModelAPI
 import GeomAPI
 
-import geom  # To be removed when gp_Ax3 will be Pythonized
+from .. import geom  # To be removed when gp_Ax3 will be Pythonized
 
 
 def moduleDocument ():
diff --git a/src/PythonAPI/model/sketcher/arc.py b/src/PythonAPI/model/sketcher/arc.py
index 7502a6b56..6cdd425c8 100644
--- a/src/PythonAPI/model/sketcher/arc.py
+++ b/src/PythonAPI/model/sketcher/arc.py
@@ -1,8 +1,8 @@
 """Sketch circle feature interface."""
 
 from GeomDataAPI import geomDataAPI_Point2D
-from model.errors import WrongNumberOfArguments
-from model.roots import Interface
+from ...model.errors import WrongNumberOfArguments
+from ...model.roots import Interface
 
 class Arc(Interface):
     """Interface to a sketch arc feature."""
diff --git a/src/PythonAPI/model/sketcher/circle.py b/src/PythonAPI/model/sketcher/circle.py
index a3ba89a1e..0d0c0ce8b 100644
--- a/src/PythonAPI/model/sketcher/circle.py
+++ b/src/PythonAPI/model/sketcher/circle.py
@@ -1,28 +1,28 @@
 """Sketch circle feature interface."""
 
 from GeomDataAPI import geomDataAPI_Point2D
-from model.roots import Interface
+from ...model.roots import Interface
 
 class Circle(Interface):
     """Interface for circle feature data manipulation."""
     def __init__(self, feature, *args):
         Interface.__init__(self, feature)
         assert(self._feature.getKind() == "SketchCircle")
-        
+
         self._center = geomDataAPI_Point2D(
             self._feature.data().attribute("CircleCenter")
             )
         self._radius = self._feature.data().real("CircleRadius")
-        
+
         if not args:
             return
-        
+
         if len(args) != 3:
             raise TypeError(
-                "Invalid number of arguments, 3 arguments needed  (%s given)" 
+                "Invalid number of arguments, 3 arguments needed  (%s given)"
                 % len(args)
                 )
-        
+
         self.setCenter(args[0], args[1])
         self.setRadius(args[2])
         self.execute()
@@ -30,18 +30,18 @@ class Circle(Interface):
     def setCenter(self, x, y):
         """Set the center of the circle."""
         self._center.setValue(x, y)
-        
+
     def setRadius(self, radius):
         """Set the radius of the circle."""
         self._radius.setValue(radius)
-        
+
     def center(self):
         """Return the center attribute of the circle."""
         return self._center
 
     def radius(self):
         """Return the radius value.
-        
+
         :return: radius
         :rtype: double
         """
diff --git a/src/PythonAPI/model/sketcher/entity.py b/src/PythonAPI/model/sketcher/entity.py
index b2cea8803..5c1b5cf58 100644
--- a/src/PythonAPI/model/sketcher/entity.py
+++ b/src/PythonAPI/model/sketcher/entity.py
@@ -1,5 +1,5 @@
 
-from model.roots import Interface
+from ...model.roots import Interface
 
 class Entity(Interface):
     """Interface for editing of a sketch entity feature."""
diff --git a/src/PythonAPI/model/sketcher/line.py b/src/PythonAPI/model/sketcher/line.py
index 128e7b3c8..9a0162651 100644
--- a/src/PythonAPI/model/sketcher/line.py
+++ b/src/PythonAPI/model/sketcher/line.py
@@ -1,6 +1,6 @@
 from GeomDataAPI import geomDataAPI_Point2D
-from model.roots import Interface
-from model.errors import WrongNumberOfArguments
+from ...model.roots import Interface
+from ...model.errors import WrongNumberOfArguments
 
 from .entity import Entity
 
diff --git a/src/PythonAPI/model/sketcher/mirror.py b/src/PythonAPI/model/sketcher/mirror.py
index dba62b4ad..540444a35 100644
--- a/src/PythonAPI/model/sketcher/mirror.py
+++ b/src/PythonAPI/model/sketcher/mirror.py
@@ -2,15 +2,15 @@
 
 from GeomDataAPI import geomDataAPI_Point2D
 from ModelAPI import ModelAPI_Feature
-from model.roots import Interface
-from model.errors import FeatureInputInvalid
+from ...model.roots import Interface
+from ...model.errors import FeatureInputInvalid
 
 class Mirror(Interface):
     """Interface on mirror constraint for data manipulation."""
     def __init__(self, feature, mirror_line, *mirror_objects):
         Interface.__init__(self, feature)
         assert(self._feature.getKind() == "SketchConstraintMirror")
-        
+
         self._feature.data().refattr("ConstraintEntityA").setObject(mirror_line)
         self._feature.data().reflist("ConstraintEntityB").clear()
         for object_ in mirror_objects:
diff --git a/src/PythonAPI/model/sketcher/point.py b/src/PythonAPI/model/sketcher/point.py
index ce6c2839a..210dfab12 100644
--- a/src/PythonAPI/model/sketcher/point.py
+++ b/src/PythonAPI/model/sketcher/point.py
@@ -1,15 +1,15 @@
 """Sketch point feature interface."""
 
 from GeomDataAPI import geomDataAPI_Point2D
-from model.roots import Interface
-from model.errors import FeatureInputInvalid
+from ...model.roots import Interface
+from ...model.errors import FeatureInputInvalid
 
 class Point(Interface):
     """Interface on point feature for data manipulation."""
     def __init__(self, feature, x, y):
         Interface.__init__(self, feature)
         assert(self._feature.getKind() == "SketchPoint")
-        
+
         # Initialize attributes of the feature
         self._point_data = geomDataAPI_Point2D(
             self._feature.data().attribute("PointCoordindates")
diff --git a/src/PythonAPI/model/sketcher/sketch.py b/src/PythonAPI/model/sketcher/sketch.py
index 9dabe0a9d..9053549ef 100644
--- a/src/PythonAPI/model/sketcher/sketch.py
+++ b/src/PythonAPI/model/sketcher/sketch.py
@@ -12,7 +12,7 @@ Example of code:
 
 .. doctest::
 
-   >>> import model
+   >>> from shaper import model
    >>> model.begin()
    >>> partset = model.moduleDocument()
    >>> part = model.addPart(partset).document()
@@ -29,13 +29,13 @@ from ModelAPI import modelAPI_ResultConstruction, featureToCompositeFeature
 from GeomDataAPI import geomDataAPI_Point, geomDataAPI_Dir
 from GeomAlgoAPI import GeomAlgoAPI_SketchBuilder, ShapeList
 
-from model.sketcher.point import Point
-from model.sketcher.line import Line
-from model.sketcher.circle import Circle
-from model.sketcher.arc import Arc
-from model.sketcher.mirror import Mirror
-from model.roots import Interface
-from model.tools import Selection
+from ...model.sketcher.point import Point
+from ...model.sketcher.line import Line
+from ...model.sketcher.circle import Circle
+from ...model.sketcher.arc import Arc
+from ...model.sketcher.mirror import Mirror
+from ...model.roots import Interface
+from ...model.tools import Selection
 
 
 def addSketch(document, plane):
diff --git a/src/PythonAPI/plugins/__init__.py b/src/PythonAPI/plugins/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/PythonAddons/CMakeLists.txt b/src/PythonAddons/CMakeLists.txt
index 37f3efc05..973c67f47 100644
--- a/src/PythonAddons/CMakeLists.txt
+++ b/src/PythonAddons/CMakeLists.txt
@@ -3,8 +3,14 @@
 
 SET(CMAKE_AUTOMOC ON)
 
-INSTALL(FILES addons_Features.py addons_Features.xml DESTINATION plugins)
+# configuration
+CONFIGURE_FILE(
+  "${CMAKE_CURRENT_SOURCE_DIR}/addons_Features.xml.in"
+  "${CMAKE_CURRENT_BINARY_DIR}/addons_Features.xml"
+  )
 
+INSTALL(FILES addons_Features.py DESTINATION ${PYTHONAPI_DIR}/plugins)
+INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/addons_Features.xml DESTINATION plugins)
 
-INSTALL(FILES __init__.py DESTINATION addons)
-INSTALL(DIRECTORY macros DESTINATION addons)
+INSTALL(FILES __init__.py DESTINATION ${PYTHONAPI_DIR}/addons)
+INSTALL(DIRECTORY macros DESTINATION ${PYTHONAPI_DIR}/addons)
diff --git a/src/PythonAddons/addons_Features.py b/src/PythonAddons/addons_Features.py
index 3fef980a8..212aa107a 100644
--- a/src/PythonAddons/addons_Features.py
+++ b/src/PythonAddons/addons_Features.py
@@ -2,7 +2,7 @@
 """
 
 import ModelAPI
-from macros.box.feature      import BoxFeature
+from ..addons.macros.box.feature      import BoxFeature
 
 
 class PythonFeaturesPlugin(ModelAPI.ModelAPI_Plugin):
diff --git a/src/PythonAddons/addons_Features.xml b/src/PythonAddons/addons_Features.xml
deleted file mode 100644
index cc18bfb85..000000000
--- a/src/PythonAddons/addons_Features.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<plugin>
-  <source path="../addons/macros/box/widget.xml"/>
-</plugin>
diff --git a/src/PythonAddons/addons_Features.xml.in b/src/PythonAddons/addons_Features.xml.in
new file mode 100644
index 000000000..03b5039f5
--- /dev/null
+++ b/src/PythonAddons/addons_Features.xml.in
@@ -0,0 +1,3 @@
+<plugin>
+  <source path="../@PYTHONAPI_DIR@/addons/macros/box/widget.xml"/>
+</plugin>
\ No newline at end of file
diff --git a/src/PythonAddons/macros/box/feature.py b/src/PythonAddons/macros/box/feature.py
index 1d3f02f07..bc5c05849 100644
--- a/src/PythonAddons/macros/box/feature.py
+++ b/src/PythonAddons/macros/box/feature.py
@@ -3,8 +3,8 @@ Authors: Renaud Nedelec - Daniel Brunier-Coulin
 Copyright (C) 2014-20xx CEA/DEN, EDF R&D
 """
 
-import model
-import geom
+from .... import model
+from .... import geom
 
 
 class BoxFeature(model.Feature):
-- 
2.39.2