diff --git a/hurricane/src/hviewer/CMakeLists.txt b/hurricane/src/hviewer/CMakeLists.txt
index 6850f615..eb987f2a 100644
--- a/hurricane/src/hviewer/CMakeLists.txt
+++ b/hurricane/src/hviewer/CMakeLists.txt
@@ -1,26 +1,28 @@
 
                include ( ${QT_USE_FILE} )
 
-   include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane )
+   include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane
+                         ${HURRICANE_SOURCE_DIR}/src/hviewer
+                       )
 
-                   set ( includes    ScreenUtilities.h
-                                     DisplayStyle.h
-                                     Graphics.h
+                   set ( includes    hurricane/viewer/ScreenUtilities.h
+                                     hurricane/viewer/DisplayStyle.h
+                                     hurricane/viewer/Graphics.h
                        )
-                   set ( mocincludes PaletteEntry.h
-                                     LayerPaletteEntry.h
-                                     GroupPaletteEntry.h
-                                     ViewerPaletteEntry.h
-                                     Palette.h
-                                     CellWidget.h
-                                     CellViewer.h
+                   set ( mocincludes hurricane/viewer/PaletteEntry.h
+                                     hurricane/viewer/LayerPaletteEntry.h
+                                     hurricane/viewer/GroupPaletteEntry.h
+                                     hurricane/viewer/ViewerPaletteEntry.h
+                                     hurricane/viewer/Palette.h
+                                     hurricane/viewer/CellWidget.h
+                                     hurricane/viewer/CellViewer.h
                        )
-                   set ( exports     ScreenUtilities.h
-                                     PaletteEntry.h
-                                     Palette.h
-                                     DisplayStyle.h
-                                     Graphics.h
-                                     CellViewer.h
+                   set ( exports     hurricane/viewer/ScreenUtilities.h
+                                     hurricane/viewer/PaletteEntry.h
+                                     hurricane/viewer/Palette.h
+                                     hurricane/viewer/DisplayStyle.h
+                                     hurricane/viewer/Graphics.h
+                                     hurricane/viewer/CellViewer.h
                        )
                    set ( cpps        ScreenUtilities.cpp 
                                      DisplayStyle.cpp 
@@ -40,5 +42,5 @@
            add_library ( hviewer     SHARED ${cpps} ${MOC_SRCS} ${RCC_SRCS} )
  target_link_libraries ( hviewer     ${QT_LIBRARIES} hurricane )
 
-               install ( FILES       ${exports} DESTINATION /include/hurricane ) 
+               install ( FILES       ${exports} DESTINATION /include/hurricane/viewer ) 
                install ( TARGETS     hviewer    DESTINATION /lib )
diff --git a/hurricane/src/hviewer/CellViewer.cpp b/hurricane/src/hviewer/CellViewer.cpp
index c3132ac0..8cf429fb 100644
--- a/hurricane/src/hviewer/CellViewer.cpp
+++ b/hurricane/src/hviewer/CellViewer.cpp
@@ -8,12 +8,12 @@
 # include  <QMenuBar>
 # include  <QDockWidget>
 
-# include  "Cell.h"
+# include  "hurricane/Cell.h"
 
 //# include  "MapView.h"
-# include  "Palette.h"
-# include  "CellWidget.h"
-# include  "CellViewer.h"
+# include  "hurricane/viewer/Palette.h"
+# include  "hurricane/viewer/CellWidget.h"
+# include  "hurricane/viewer/CellViewer.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/CellWidget.cpp b/hurricane/src/hviewer/CellWidget.cpp
index 9ff97ca5..b27038f5 100644
--- a/hurricane/src/hviewer/CellWidget.cpp
+++ b/hurricane/src/hviewer/CellWidget.cpp
@@ -9,20 +9,20 @@
 # include <QStylePainter>
 # include <QBitmap>
 
-# include "DataBase.h"
-# include "Technology.h"
-# include "BasicLayer.h"
-# include "Cell.h"
-# include "Instance.h"
-# include "Slice.h"
-# include "Segment.h"
-# include "Contact.h"
+# include "hurricane/DataBase.h"
+# include "hurricane/Technology.h"
+# include "hurricane/BasicLayer.h"
+# include "hurricane/Cell.h"
+# include "hurricane/Instance.h"
+# include "hurricane/Slice.h"
+# include "hurricane/Segment.h"
+# include "hurricane/Contact.h"
 
-# include "Graphics.h"
-# include "PaletteEntry.h"
-# include "Palette.h"
+# include "hurricane/viewer/Graphics.h"
+# include "hurricane/viewer/PaletteEntry.h"
+# include "hurricane/viewer/Palette.h"
 // # include "MapView.h"
-# include "CellWidget.h"
+# include "hurricane/viewer/CellWidget.h"
 
 
 
diff --git a/hurricane/src/hviewer/DisplayStyle.cpp b/hurricane/src/hviewer/DisplayStyle.cpp
index 4d1bf482..9b530fdb 100644
--- a/hurricane/src/hviewer/DisplayStyle.cpp
+++ b/hurricane/src/hviewer/DisplayStyle.cpp
@@ -4,7 +4,7 @@
 
 # include  <cassert>
 
-# include  "DisplayStyle.h"
+# include  "hurricane/viewer/DisplayStyle.h"
 
 
 
diff --git a/hurricane/src/hviewer/Graphics.cpp b/hurricane/src/hviewer/Graphics.cpp
index 78051d1c..eadd3de2 100644
--- a/hurricane/src/hviewer/Graphics.cpp
+++ b/hurricane/src/hviewer/Graphics.cpp
@@ -10,10 +10,10 @@
 # include  <QFont>
 # include  <QApplication>
 
-# include  "Name.h"
+# include  "hurricane/Name.h"
 
-# include  "DisplayStyle.h"
-# include  "Graphics.h"
+# include  "hurricane/viewer/DisplayStyle.h"
+# include  "hurricane/viewer/Graphics.h"
 
 
 
diff --git a/hurricane/src/hviewer/GroupPaletteEntry.cpp b/hurricane/src/hviewer/GroupPaletteEntry.cpp
index 373d9c33..052fa6ed 100644
--- a/hurricane/src/hviewer/GroupPaletteEntry.cpp
+++ b/hurricane/src/hviewer/GroupPaletteEntry.cpp
@@ -5,9 +5,9 @@
 # include  <QPushButton>
 # include  <QHBoxLayout>
 
-# include  "Graphics.h"
-# include  "GroupPaletteEntry.h"
-# include  "Palette.h"
+# include  "hurricane/viewer/Graphics.h"
+# include  "hurricane/viewer/GroupPaletteEntry.h"
+# include  "hurricane/viewer/Palette.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/LayerPaletteEntry.cpp b/hurricane/src/hviewer/LayerPaletteEntry.cpp
index 2b1fa2fc..0753dfe2 100644
--- a/hurricane/src/hviewer/LayerPaletteEntry.cpp
+++ b/hurricane/src/hviewer/LayerPaletteEntry.cpp
@@ -5,11 +5,11 @@
 # include  <QCheckBox>
 # include  <QHBoxLayout>
 
-# include  "BasicLayer.h"
+# include  "hurricane/BasicLayer.h"
 
-# include  "Graphics.h"
-# include  "LayerPaletteEntry.h"
-# include  "Palette.h"
+# include  "hurricane/viewer/Graphics.h"
+# include  "hurricane/viewer/LayerPaletteEntry.h"
+# include  "hurricane/viewer/Palette.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/Palette.cpp b/hurricane/src/hviewer/Palette.cpp
index b4684e8b..2c1451a9 100644
--- a/hurricane/src/hviewer/Palette.cpp
+++ b/hurricane/src/hviewer/Palette.cpp
@@ -9,19 +9,19 @@
 # include  <QCheckBox>
 # include  <QPushButton>
 
-# include  "Name.h"
-# include  "DataBase.h"
-# include  "Technology.h"
-# include  "BasicLayer.h"
-# include  "BasicLayers.h"
+# include  "hurricane/Name.h"
+# include  "hurricane/DataBase.h"
+# include  "hurricane/Technology.h"
+# include  "hurricane/BasicLayer.h"
+# include  "hurricane/BasicLayers.h"
 
-# include  "Graphics.h"
-# include  "PaletteEntry.h"
-# include  "LayerPaletteEntry.h"
-# include  "GroupPaletteEntry.h"
-# include  "ViewerPaletteEntry.h"
-# include  "Palette.h"
-# include  "CellWidget.h"
+# include  "hurricane/viewer/Graphics.h"
+# include  "hurricane/viewer/PaletteEntry.h"
+# include  "hurricane/viewer/LayerPaletteEntry.h"
+# include  "hurricane/viewer/GroupPaletteEntry.h"
+# include  "hurricane/viewer/ViewerPaletteEntry.h"
+# include  "hurricane/viewer/Palette.h"
+# include  "hurricane/viewer/CellWidget.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/PaletteEntry.cpp b/hurricane/src/hviewer/PaletteEntry.cpp
index d6f6d655..0cf6c75f 100644
--- a/hurricane/src/hviewer/PaletteEntry.cpp
+++ b/hurricane/src/hviewer/PaletteEntry.cpp
@@ -4,8 +4,8 @@
 
 # include  <QPainter>
 
-# include  "Graphics.h"
-# include  "PaletteEntry.h"
+# include  "hurricane/viewer/Graphics.h"
+# include  "hurricane/viewer/PaletteEntry.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/ScreenUtilities.cpp b/hurricane/src/hviewer/ScreenUtilities.cpp
index 4ec48a8c..309838a4 100644
--- a/hurricane/src/hviewer/ScreenUtilities.cpp
+++ b/hurricane/src/hviewer/ScreenUtilities.cpp
@@ -4,9 +4,9 @@
 
 # include  <QBitmap>
 
-# include  "BasicLayer.h"
+# include  "hurricane/BasicLayer.h"
 
-# include  "ScreenUtilities.h"
+# include  "hurricane/viewer/ScreenUtilities.h"
 
 
 
diff --git a/hurricane/src/hviewer/ViewerPaletteEntry.cpp b/hurricane/src/hviewer/ViewerPaletteEntry.cpp
index 7bc84586..af61f1b9 100644
--- a/hurricane/src/hviewer/ViewerPaletteEntry.cpp
+++ b/hurricane/src/hviewer/ViewerPaletteEntry.cpp
@@ -5,11 +5,11 @@
 # include  <QCheckBox>
 # include  <QHBoxLayout>
 
-# include  "BasicLayer.h"
+# include  "hurricane/BasicLayer.h"
 
-# include  "Graphics.h"
-# include  "ViewerPaletteEntry.h"
-# include  "Palette.h"
+# include  "hurricane/viewer/Graphics.h"
+# include  "hurricane/viewer/ViewerPaletteEntry.h"
+# include  "hurricane/viewer/Palette.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/CellViewer.h b/hurricane/src/hviewer/hurricane/viewer/CellViewer.h
similarity index 96%
rename from hurricane/src/hviewer/CellViewer.h
rename to hurricane/src/hviewer/hurricane/viewer/CellViewer.h
index add53688..d36e481a 100644
--- a/hurricane/src/hviewer/CellViewer.h
+++ b/hurricane/src/hviewer/hurricane/viewer/CellViewer.h
@@ -14,7 +14,7 @@ class QKeyEvent;
 class QAction;
 class QMenu;
 
-# include  "Commons.h"
+# include  "hurricane/Commons.h"
 
 
 
diff --git a/hurricane/src/hviewer/CellWidget.h b/hurricane/src/hviewer/hurricane/viewer/CellWidget.h
similarity index 97%
rename from hurricane/src/hviewer/CellWidget.h
rename to hurricane/src/hviewer/hurricane/viewer/CellWidget.h
index ed07797b..081240ff 100644
--- a/hurricane/src/hviewer/CellWidget.h
+++ b/hurricane/src/hviewer/hurricane/viewer/CellWidget.h
@@ -22,12 +22,12 @@ class QKeyEvent;
 class QAction;
 
 
-# include  "Commons.h"
-# include  "Point.h"
-# include  "Box.h"
-# include  "Transformation.h"
+# include  "hurricane/Commons.h"
+# include  "hurricane/Point.h"
+# include  "hurricane/Box.h"
+# include  "hurricane/Transformation.h"
 
-# include  "DisplayStyle.h"
+# include  "hurricane/viewer/DisplayStyle.h"
 
 
 
diff --git a/hurricane/src/hviewer/DisplayStyle.h b/hurricane/src/hviewer/hurricane/viewer/DisplayStyle.h
similarity index 98%
rename from hurricane/src/hviewer/DisplayStyle.h
rename to hurricane/src/hviewer/hurricane/viewer/DisplayStyle.h
index a1b29304..1d77a1df 100644
--- a/hurricane/src/hviewer/DisplayStyle.h
+++ b/hurricane/src/hviewer/hurricane/viewer/DisplayStyle.h
@@ -13,10 +13,10 @@
 # include  <QPen>
 # include  <QBrush>
 
-# include  "Commons.h"
-# include  "Name.h"
+# include  "hurricane/Commons.h"
+# include  "hurricane/Name.h"
 
-# include  "ScreenUtilities.h"
+# include  "hurricane/viewer/ScreenUtilities.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/Graphics.h b/hurricane/src/hviewer/hurricane/viewer/Graphics.h
similarity index 98%
rename from hurricane/src/hviewer/Graphics.h
rename to hurricane/src/hviewer/hurricane/viewer/Graphics.h
index d4383163..b464ce41 100644
--- a/hurricane/src/hviewer/Graphics.h
+++ b/hurricane/src/hviewer/hurricane/viewer/Graphics.h
@@ -9,7 +9,7 @@
 # include  <string>
 # include  <vector>
 
-# include  "DisplayStyle.h"
+# include  "hurricane/viewer/DisplayStyle.h"
 
 class QFont;
 class QColor;
diff --git a/hurricane/src/hviewer/GroupPaletteEntry.h b/hurricane/src/hviewer/hurricane/viewer/GroupPaletteEntry.h
similarity index 95%
rename from hurricane/src/hviewer/GroupPaletteEntry.h
rename to hurricane/src/hviewer/hurricane/viewer/GroupPaletteEntry.h
index 21d295e5..13a097ed 100644
--- a/hurricane/src/hviewer/GroupPaletteEntry.h
+++ b/hurricane/src/hviewer/hurricane/viewer/GroupPaletteEntry.h
@@ -8,9 +8,9 @@
 
 class QPushButton;
 
-# include  "Name.h"
+# include  "hurricane/Name.h"
 
-# include  "PaletteEntry.h"
+# include  "hurricane/viewer/PaletteEntry.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/LayerPaletteEntry.h b/hurricane/src/hviewer/hurricane/viewer/LayerPaletteEntry.h
similarity index 96%
rename from hurricane/src/hviewer/LayerPaletteEntry.h
rename to hurricane/src/hviewer/hurricane/viewer/LayerPaletteEntry.h
index 47973337..190f52e6 100644
--- a/hurricane/src/hviewer/LayerPaletteEntry.h
+++ b/hurricane/src/hviewer/hurricane/viewer/LayerPaletteEntry.h
@@ -8,7 +8,7 @@
 
 class QCheckBox;
 
-# include  "PaletteEntry.h"
+# include  "hurricane/viewer/PaletteEntry.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/Palette.h b/hurricane/src/hviewer/hurricane/viewer/Palette.h
similarity index 98%
rename from hurricane/src/hviewer/Palette.h
rename to hurricane/src/hviewer/hurricane/viewer/Palette.h
index 714a46d5..579f86ba 100644
--- a/hurricane/src/hviewer/Palette.h
+++ b/hurricane/src/hviewer/hurricane/viewer/Palette.h
@@ -10,7 +10,7 @@
 # include  <QScrollArea>
 # include  <QPixmap>
 
-# include  "Commons.h"
+# include  "hurricane/Commons.h"
 
 
   class QCheckBox;
diff --git a/hurricane/src/hviewer/PaletteEntry.h b/hurricane/src/hviewer/hurricane/viewer/PaletteEntry.h
similarity index 97%
rename from hurricane/src/hviewer/PaletteEntry.h
rename to hurricane/src/hviewer/hurricane/viewer/PaletteEntry.h
index 0fb0c046..2f0722b6 100644
--- a/hurricane/src/hviewer/PaletteEntry.h
+++ b/hurricane/src/hviewer/hurricane/viewer/PaletteEntry.h
@@ -12,7 +12,7 @@
 class QPaintEvent;
 class QCheckBox;
 
-# include  "Commons.h"
+# include  "hurricane/Commons.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/ScreenUtilities.h b/hurricane/src/hviewer/hurricane/viewer/ScreenUtilities.h
similarity index 91%
rename from hurricane/src/hviewer/ScreenUtilities.h
rename to hurricane/src/hviewer/hurricane/viewer/ScreenUtilities.h
index 61591fcc..fe5e2c39 100644
--- a/hurricane/src/hviewer/ScreenUtilities.h
+++ b/hurricane/src/hviewer/hurricane/viewer/ScreenUtilities.h
@@ -8,7 +8,7 @@
 # include  <string>
 # include  <QBrush>
 
-# include  "Commons.h"
+# include  "hurricane/Commons.h"
 
 
 namespace Hurricane {
diff --git a/hurricane/src/hviewer/ViewerPaletteEntry.h b/hurricane/src/hviewer/hurricane/viewer/ViewerPaletteEntry.h
similarity index 94%
rename from hurricane/src/hviewer/ViewerPaletteEntry.h
rename to hurricane/src/hviewer/hurricane/viewer/ViewerPaletteEntry.h
index 2b0cb48d..b016e19c 100644
--- a/hurricane/src/hviewer/ViewerPaletteEntry.h
+++ b/hurricane/src/hviewer/hurricane/viewer/ViewerPaletteEntry.h
@@ -8,8 +8,8 @@
 
 class QCheckBox;
 
-# include  "Name.h"
-# include  "PaletteEntry.h"
+# include  "hurricane/Name.h"
+# include  "hurricane/viewer/PaletteEntry.h"
 
 
 namespace Hurricane {