diff --git a/Sources/appl/Buffer/Buffer.cpp b/Sources/appl/Buffer/Buffer.cpp
index bc31439..8995942 100644
--- a/Sources/appl/Buffer/Buffer.cpp
+++ b/Sources/appl/Buffer/Buffer.cpp
@@ -27,7 +27,7 @@
 #include <appl/global.h>
 #include <Buffer.h>
 #include <BufferManager.h>
-#include <ewol/EObject.h>
+#include <ewol/eObject/EObject.h>
 
 #undef __class__
 #define __class__	"Buffer"
diff --git a/Sources/appl/Buffer/BufferManager.cpp b/Sources/appl/Buffer/BufferManager.cpp
index 2211f5f..6839744 100644
--- a/Sources/appl/Buffer/BufferManager.cpp
+++ b/Sources/appl/Buffer/BufferManager.cpp
@@ -27,8 +27,8 @@
 #include <appl/Debug.h>
 #include <appl/global.h>
 #include <BufferManager.h>
-#include <ewol/EObject.h>
-#include <ewol/EObjectManager.h>
+#include <ewol/eObject/EObject.h>
+#include <ewol/eObject/EObjectManager.h>
 
 #undef __class__
 #define __class__	"classBufferManager"
diff --git a/Sources/appl/Buffer/BufferManager.h b/Sources/appl/Buffer/BufferManager.h
index 5a0e3b6..aba0750 100644
--- a/Sources/appl/Buffer/BufferManager.h
+++ b/Sources/appl/Buffer/BufferManager.h
@@ -30,7 +30,7 @@
 #include <BufferText.h>
 #include <BufferEmpty.h>
 #include <appl/globalMsg.h>
-#include <ewol/Widget.h>
+#include <ewol/widget/Widget.h>
 
 namespace BufferManager
 {
diff --git a/Sources/appl/Buffer/BufferText.cpp b/Sources/appl/Buffer/BufferText.cpp
index 860e0b0..83ded51 100644
--- a/Sources/appl/Buffer/BufferText.cpp
+++ b/Sources/appl/Buffer/BufferText.cpp
@@ -30,10 +30,10 @@
 #include <etk/unicode.h>
 
 #include <ewol/ewol.h>
-#include <ewol/OObject.h>
-#include <ewol/WidgetManager.h>
-#include <ewol/Widget.h>
-#include <ewol/Font.h>
+#include <ewol/oObject/OObject.h>
+#include <ewol/widget/WidgetManager.h>
+#include <ewol/widget/Widget.h>
+#include <ewol/font/Font.h>
 #include <ewol/ClipBoard.h>
 
 
diff --git a/Sources/appl/Colorize/ColorizeManager.cpp b/Sources/appl/Colorize/ColorizeManager.cpp
index 3dfdc32..c6d0a1b 100644
--- a/Sources/appl/Colorize/ColorizeManager.cpp
+++ b/Sources/appl/Colorize/ColorizeManager.cpp
@@ -26,8 +26,8 @@
 #include <appl/global.h>
 #include <ColorizeManager.h>
 #include <tinyXML/tinyxml.h>
-#include <ewol/EObject.h>
-#include <ewol/EObjectManager.h>
+#include <ewol/eObject/EObject.h>
+#include <ewol/eObject/EObjectManager.h>
 
 #define PFX	"ColorizeManager "
 
diff --git a/Sources/appl/Colorize/ColorizeManager.h b/Sources/appl/Colorize/ColorizeManager.h
index eba1d55..b32c901 100644
--- a/Sources/appl/Colorize/ColorizeManager.h
+++ b/Sources/appl/Colorize/ColorizeManager.h
@@ -28,7 +28,7 @@
 
 #include <Colorize.h>
 #include <appl/globalMsg.h>
-#include <ewol/Widget.h>
+#include <ewol/widget/Widget.h>
 
 typedef enum {
 	// BASIC color for codeViewer
diff --git a/Sources/appl/Gui/BufferView.cpp b/Sources/appl/Gui/BufferView.cpp
index 6f5f062..c74f981 100644
--- a/Sources/appl/Gui/BufferView.cpp
+++ b/Sources/appl/Gui/BufferView.cpp
@@ -29,7 +29,7 @@
 #include <BufferManager.h>
 #include <ColorizeManager.h>
 #include <MainWindows.h>
-#include <ewol/EObject.h>
+#include <ewol/eObject/EObject.h>
 
 #undef __class__
 #define __class__	"BufferView"
diff --git a/Sources/appl/Gui/CodeView.cpp b/Sources/appl/Gui/CodeView.cpp
index c1cf026..c380fda 100644
--- a/Sources/appl/Gui/CodeView.cpp
+++ b/Sources/appl/Gui/CodeView.cpp
@@ -34,8 +34,8 @@
 #include <ewol/ClipBoard.h>
 #include <SearchData.h>
 
-#include <ewol/WidgetManager.h>
-#include <ewol/EObject.h>
+#include <ewol/widget/WidgetManager.h>
+#include <ewol/eObject/EObject.h>
 
 
 #undef __class__
diff --git a/Sources/appl/Gui/MainWindows.cpp b/Sources/appl/Gui/MainWindows.cpp
index 77ede39..dcfacc6 100644
--- a/Sources/appl/Gui/MainWindows.cpp
+++ b/Sources/appl/Gui/MainWindows.cpp
@@ -41,10 +41,10 @@
 #include <ewol/widget/PopUp.h>
 #include <ewol/widget/Spacer.h>
 #include <ewol/widget/Menu.h>
-#include <ewol/widgetMeta/FileChooser.h>
-#include <ewol/widgetMeta/Parameter.h>
-#include <ewol/WidgetManager.h>
-#include <ewol/EObject.h>
+#include <ewol/widget/meta/FileChooser.h>
+#include <ewol/widget/meta/Parameter.h>
+#include <ewol/widget/WidgetManager.h>
+#include <ewol/eObject/EObject.h>
 
 
 
diff --git a/Sources/appl/Highlight/HighlightManager.cpp b/Sources/appl/Highlight/HighlightManager.cpp
index b10b940..dcf0fcd 100644
--- a/Sources/appl/Highlight/HighlightManager.cpp
+++ b/Sources/appl/Highlight/HighlightManager.cpp
@@ -26,8 +26,8 @@
 #include <appl/Debug.h>
 #include <appl/global.h>
 #include <HighlightManager.h>
-#include <ewol/EObject.h>
-#include <ewol/EObjectManager.h>
+#include <ewol/eObject/EObject.h>
+#include <ewol/eObject/EObjectManager.h>
 
 #undef __class__
 #define __class__	"HighlightManager"
diff --git a/Sources/appl/Highlight/HighlightManager.h b/Sources/appl/Highlight/HighlightManager.h
index 201e15e..d7cc910 100644
--- a/Sources/appl/Highlight/HighlightManager.h
+++ b/Sources/appl/Highlight/HighlightManager.h
@@ -30,7 +30,7 @@
 #include <etk/UString.h>
 #include <appl/globalMsg.h>
 #include <Highlight.h>
-#include <ewol/Widget.h>
+#include <ewol/widget/Widget.h>
 
 namespace HighlightManager{
 	void       Init(void);
diff --git a/Sources/appl/ctags/CTagsManager.cpp b/Sources/appl/ctags/CTagsManager.cpp
index abca180..1133872 100644
--- a/Sources/appl/ctags/CTagsManager.cpp
+++ b/Sources/appl/ctags/CTagsManager.cpp
@@ -27,7 +27,7 @@
 #include <appl/global.h>
 #include <CTagsManager.h>
 #include <BufferManager.h>
-#include <ewol/EObject.h>
+#include <ewol/eObject/EObject.h>
 
 
 
diff --git a/Sources/appl/ctags/CTagsManager.h b/Sources/appl/ctags/CTagsManager.h
index 1d1bff9..4d8128b 100644
--- a/Sources/appl/ctags/CTagsManager.h
+++ b/Sources/appl/ctags/CTagsManager.h
@@ -27,7 +27,7 @@
 #define __C_TAGS_MANAGER_H__
 
 
-#include <ewol/Widget.h>
+#include <ewol/widget/Widget.h>
 #include "appl/globalMsg.h"
 #include "readtags.h"
 
diff --git a/Sources/appl/global.cpp b/Sources/appl/global.cpp
index f75667c..5ae3201 100644
--- a/Sources/appl/global.cpp
+++ b/Sources/appl/global.cpp
@@ -26,7 +26,7 @@
 #include <appl/global.h>
 #include <ColorizeManager.h>
 #include <appl/globalMsg.h>
-#include <ewol/EObject.h>
+#include <ewol/eObject/EObject.h>
 
 #undef __class__
 #define __class__	"globals"
diff --git a/Sources/appl/init.cpp b/Sources/appl/init.cpp
index 4781f1a..c013112 100644
--- a/Sources/appl/init.cpp
+++ b/Sources/appl/init.cpp
@@ -25,8 +25,8 @@
 
 #include <etk/UString.h>
 #include <ewol/ewol.h>
-#include <ewol/EObject.h>
-#include <ewol/WidgetManager.h>
+#include <ewol/eObject/EObject.h>
+#include <ewol/widget/WidgetManager.h>
 
 #include <appl/Debug.h>
 #include <appl/global.h>