diff --git a/hurricane/src/hinspector/CMakeLists.txt b/hurricane/src/hinspector/CMakeLists.txt
index 05bdd344..c2862ade 100644
--- a/hurricane/src/hinspector/CMakeLists.txt
+++ b/hurricane/src/hinspector/CMakeLists.txt
@@ -1,14 +1,22 @@
-include(${QT_USE_FILE})
 
-include_directories(${HURRICANE_SOURCE_DIR}/src/hurricane)
+               include ( ${QT_USE_FILE} )
 
-set(mocincludes RecordModel.h HInspectorWidget.h)
-set(cpps RecordModel.cpp HInspectorWidget.cpp)
+   include_directories ( ${HURRICANE_SOURCE_DIR}/src/hurricane
+                         ${HURRICANE_SOURCE_DIR}/src/hinspector
+                       )
 
-QT4_WRAP_CPP(MOC_SRCS ${mocincludes})
+                   set ( mocincludes hurricane/inspector/RecordModel.h
+                                     hurricane/inspector/HInspectorWidget.h
+                       )
+                   set ( cpps        RecordModel.cpp
+                                     HInspectorWidget.cpp
+                       )
 
-add_library(hinspector SHARED ${cpps} ${MOC_SRCS})
-target_link_libraries(hinspector ${QT_LIBRARIES} hurricane)
+          qt4_wrap_cpp ( MOC_SRCS ${mocincludes} )
 
-install(FILES HInspectorWidget.h DESTINATION /include/hurricane) 
-install(TARGETS hinspector DESTINATION /lib)
+           add_library ( hinspector SHARED ${cpps} ${MOC_SRCS} )
+ target_link_libraries ( hinspector ${QT_LIBRARIES} hurricane )
+
+               install ( FILES   hurricane/inspector/HInspectorWidget.h
+                                                    DESTINATION /include/hurricane/inspector ) 
+               install ( TARGETS hinspector         DESTINATION /lib )
diff --git a/hurricane/src/hinspector/HInspectorWidget.cpp b/hurricane/src/hinspector/HInspectorWidget.cpp
index 0d3ae95e..60054d60 100644
--- a/hurricane/src/hinspector/HInspectorWidget.cpp
+++ b/hurricane/src/hinspector/HInspectorWidget.cpp
@@ -7,8 +7,8 @@
 #include <QGroupBox>
 #include <QVBoxLayout>
 
-#include "RecordModel.h"
-#include "HInspectorWidget.h"
+#include "hurricane/inspector/RecordModel.h"
+#include "hurricane/inspector/HInspectorWidget.h"
 
 HInspectorWidget::HInspectorWidget(QWidget* parent):
     QWidget(parent),
diff --git a/hurricane/src/hinspector/RecordModel.cpp b/hurricane/src/hinspector/RecordModel.cpp
index 9d00619f..052e29a8 100644
--- a/hurricane/src/hinspector/RecordModel.cpp
+++ b/hurricane/src/hinspector/RecordModel.cpp
@@ -1,4 +1,4 @@
-#include "RecordModel.h"
+#include "hurricane/inspector/RecordModel.h"
 
 RecordModel::RecordModel(Record* r, QObject* parent):
     QAbstractTableModel(parent),
diff --git a/hurricane/src/hinspector/HInspectorWidget.h b/hurricane/src/hinspector/hurricane/inspector/HInspectorWidget.h
similarity index 96%
rename from hurricane/src/hinspector/HInspectorWidget.h
rename to hurricane/src/hinspector/hurricane/inspector/HInspectorWidget.h
index d0189602..3412ed6b 100644
--- a/hurricane/src/hinspector/HInspectorWidget.h
+++ b/hurricane/src/hinspector/hurricane/inspector/HInspectorWidget.h
@@ -1,7 +1,7 @@
 #ifndef HINSPECTORWIDGET_H
 #define HINSPECTORWIDGET_H
 
-#include "Commons.h"
+#include "hurricane/Commons.h"
 using namespace Hurricane;
 
 #include <QWidget>
diff --git a/hurricane/src/hinspector/RecordModel.h b/hurricane/src/hinspector/hurricane/inspector/RecordModel.h
similarity index 94%
rename from hurricane/src/hinspector/RecordModel.h
rename to hurricane/src/hinspector/hurricane/inspector/RecordModel.h
index 4190b866..7a5ec0ef 100644
--- a/hurricane/src/hinspector/RecordModel.h
+++ b/hurricane/src/hinspector/hurricane/inspector/RecordModel.h
@@ -3,7 +3,7 @@
 
 #include <QAbstractTableModel>
 
-#include "Commons.h"
+#include "hurricane/Commons.h"
 using namespace Hurricane;
 
 class RecordModel : public QAbstractTableModel {