diff --git a/cumulus/src/designflow/pnr.py b/cumulus/src/designflow/pnr.py
index a02e201b..5c587c56 100644
--- a/cumulus/src/designflow/pnr.py
+++ b/cumulus/src/designflow/pnr.py
@@ -65,8 +65,7 @@ class PnR ( FlowTask ):
         else:
             print( 'PnR.doTask() run in interactive CGT mode.' )
             PnR.textMode = False
-       #from .. import Etesian, Anabatic, Katana, Bora, Tramontana, Tutorial, Viewer, Unicorn
-        from .. import Etesian, Anabatic, Katana, Bora, Tramontana, Viewer, Unicorn
+        from .. import Etesian, Anabatic, Katana, Bora, Tramontana, Tutorial, Viewer, Unicorn
 
         ShellEnv().export()
         if self.script and not callable(self.script):
@@ -88,7 +87,7 @@ class PnR ( FlowTask ):
             unicorn.registerTool        ( Katana.GraphicKatanaEngine.grab() )
             unicorn.registerTool        ( Tramontana.GraphicTramontanaEngine.grab() )
             unicorn.registerTool        ( Bora.GraphicBoraEngine.grab() )
-           #unicorn.registerTool        ( Tutorial.GraphicTutorialEngine.grab() )
+            unicorn.registerTool        ( Tutorial.GraphicTutorialEngine.grab() )
            #unicorn.setAnonNetSelectable(False)
             unicorn.setLayerVisible     ( "grid"          , False );
             unicorn.setLayerVisible     ( "text.instance" , False );
diff --git a/meson.build b/meson.build
index 60a2009f..887f6453 100644
--- a/meson.build
+++ b/meson.build
@@ -87,4 +87,5 @@ subdir('oroshi')
 subdir('bora')
 subdir('unicorn')
 subdir('cumulus')
+subdir('tutorial')
 
diff --git a/tutorial/meson.build b/tutorial/meson.build
new file mode 100644
index 00000000..2e14a565
--- /dev/null
+++ b/tutorial/meson.build
@@ -0,0 +1,9 @@
+subdir('src')
+subdir('python')
+
+Tutorial = declare_dependency(
+  link_with: [tutorial],
+  include_directories: include_directories('src'),
+  dependencies: [CrlCore]
+)
+
diff --git a/tutorial/python/meson.build b/tutorial/python/meson.build
new file mode 100644
index 00000000..f3c15128
--- /dev/null
+++ b/tutorial/python/meson.build
@@ -0,0 +1,7 @@
+
+
+py.install_sources(
+  'runDemo.py',
+  subdir: 'coriolis/plugins',
+)
+
diff --git a/tutorial/python/runDemo.py b/tutorial/python/runDemo.py
index 1442f441..05a8cd12 100644
--- a/tutorial/python/runDemo.py
+++ b/tutorial/python/runDemo.py
@@ -25,7 +25,7 @@ try:
     from   coriolis.helpers         import trace, l, u, n
     from   coriolis.helpers.io      import showPythonTrace, ErrorMessage, WarningMessage
     from   coriolis.helpers.overlay import UpdateSession
-    import coriolis.cumulus.plugins as plugins
+    import coriolis.plugins as plugins
 except ImportError as e:
     serror = str(e)
     if serror.startswith('No module named'):
diff --git a/tutorial/src/PyTutorialEngine.cpp b/tutorial/src/PyTutorialEngine.cpp
index f1023e92..e49fa72c 100644
--- a/tutorial/src/PyTutorialEngine.cpp
+++ b/tutorial/src/PyTutorialEngine.cpp
@@ -15,7 +15,7 @@
 
 
 #include "hurricane/isobar/PyCell.h"
-#include "hurricane/isobar/PyCellViewer.h"
+#include "hurricane/viewer/PyCellViewer.h"
 #include "hurricane/viewer/ExceptionWidget.h"
 #include "hurricane/Cell.h"
 #include "crlcore/Utilities.h"
diff --git a/tutorial/src/meson.build b/tutorial/src/meson.build
new file mode 100644
index 00000000..c4a865d6
--- /dev/null
+++ b/tutorial/src/meson.build
@@ -0,0 +1,36 @@
+tutorial_mocs = qt.compile_moc(
+  headers: [
+    'tutorial/GraphicTutorialEngine.h',
+  ],
+  dependencies: [Anabatic],
+)
+
+tutorial_py = files([
+  'PyTutorial.cpp',
+  'PyTutorialEngine.cpp',
+  'PyGraphicTutorialEngine.cpp',
+])
+
+
+tutorial = shared_library(
+  'tutorial',
+
+  'GraphicTutorialEngine.cpp',
+  'TutorialEngine.cpp',
+  tutorial_mocs,
+  tutorial_py,
+  dependencies: [CrlCore],
+  install: true,
+)
+
+py.extension_module(
+  'Tutorial',
+
+  tutorial_py,
+
+  link_with: [tutorial],
+  dependencies: [py_mod_deps, CrlCore],
+  install: true,
+  subdir: 'coriolis'
+)
+