diff --git a/Sources/ewolDebug.cpp b/Sources/ewol/Debug.cpp
similarity index 100%
rename from Sources/ewolDebug.cpp
rename to Sources/ewol/Debug.cpp
diff --git a/Sources/ewolDebug.h b/Sources/ewol/Debug.h
similarity index 100%
rename from Sources/ewolDebug.h
rename to Sources/ewol/Debug.h
diff --git a/Sources/ewolFont.h b/Sources/ewol/Font.h
similarity index 100%
rename from Sources/ewolFont.h
rename to Sources/ewol/Font.h
diff --git a/Sources/ewolFontBitmap.cpp b/Sources/ewol/FontBitmap.cpp
similarity index 100%
rename from Sources/ewolFontBitmap.cpp
rename to Sources/ewol/FontBitmap.cpp
diff --git a/Sources/ewolFontFreeType.cpp b/Sources/ewol/FontFreeType.cpp
similarity index 100%
rename from Sources/ewolFontFreeType.cpp
rename to Sources/ewol/FontFreeType.cpp
diff --git a/Sources/ewolOObject.cpp b/Sources/ewol/OObject.cpp
similarity index 100%
rename from Sources/ewolOObject.cpp
rename to Sources/ewol/OObject.cpp
diff --git a/Sources/ewolOObject.h b/Sources/ewol/OObject.h
similarity index 100%
rename from Sources/ewolOObject.h
rename to Sources/ewol/OObject.h
diff --git a/Sources/ewolOObject2DColored.cpp b/Sources/ewol/OObject/2DColored.cpp
similarity index 100%
rename from Sources/ewolOObject2DColored.cpp
rename to Sources/ewol/OObject/2DColored.cpp
diff --git a/Sources/ewolOObject2DColored.h b/Sources/ewol/OObject/2DColored.h
similarity index 100%
rename from Sources/ewolOObject2DColored.h
rename to Sources/ewol/OObject/2DColored.h
diff --git a/Sources/ewolOObject2DText.cpp b/Sources/ewol/OObject/2DText.cpp
similarity index 100%
rename from Sources/ewolOObject2DText.cpp
rename to Sources/ewol/OObject/2DText.cpp
diff --git a/Sources/ewolOObject2DText.h b/Sources/ewol/OObject/2DText.h
similarity index 100%
rename from Sources/ewolOObject2DText.h
rename to Sources/ewol/OObject/2DText.h
diff --git a/Sources/ewolOObject2DTextured.cpp b/Sources/ewol/OObject/2DTextured.cpp
similarity index 100%
rename from Sources/ewolOObject2DTextured.cpp
rename to Sources/ewol/OObject/2DTextured.cpp
diff --git a/Sources/ewolOObject2DTextured.h b/Sources/ewol/OObject/2DTextured.h
similarity index 100%
rename from Sources/ewolOObject2DTextured.h
rename to Sources/ewol/OObject/2DTextured.h
diff --git a/Sources/ewolTexture.cpp b/Sources/ewol/Texture.cpp
similarity index 100%
rename from Sources/ewolTexture.cpp
rename to Sources/ewol/Texture.cpp
diff --git a/Sources/ewolTexture.h b/Sources/ewol/Texture.h
similarity index 100%
rename from Sources/ewolTexture.h
rename to Sources/ewol/Texture.h
diff --git a/Sources/ewolWidget.cpp b/Sources/ewol/Widget.cpp
similarity index 100%
rename from Sources/ewolWidget.cpp
rename to Sources/ewol/Widget.cpp
diff --git a/Sources/ewolWidget.h b/Sources/ewol/Widget.h
similarity index 100%
rename from Sources/ewolWidget.h
rename to Sources/ewol/Widget.h
diff --git a/Sources/ewolWidgetManager.cpp b/Sources/ewol/WidgetManager.cpp
similarity index 100%
rename from Sources/ewolWidgetManager.cpp
rename to Sources/ewol/WidgetManager.cpp
diff --git a/Sources/ewolWidgetManager.h b/Sources/ewol/WidgetManager.h
similarity index 100%
rename from Sources/ewolWidgetManager.h
rename to Sources/ewol/WidgetManager.h
diff --git a/Sources/ewolWindows.cpp b/Sources/ewol/Windows.cpp
similarity index 100%
rename from Sources/ewolWindows.cpp
rename to Sources/ewol/Windows.cpp
diff --git a/Sources/ewolWindows.h b/Sources/ewol/Windows.h
similarity index 100%
rename from Sources/ewolWindows.h
rename to Sources/ewol/Windows.h
diff --git a/Sources/ewol.cpp b/Sources/ewol/ewol.cpp
similarity index 100%
rename from Sources/ewol.cpp
rename to Sources/ewol/ewol.cpp
diff --git a/Sources/ewol.h b/Sources/ewol/ewol.h
similarity index 100%
rename from Sources/ewol.h
rename to Sources/ewol/ewol.h
diff --git a/Sources/widget/ewolButton.cpp b/Sources/ewol/widget/Button.cpp
similarity index 100%
rename from Sources/widget/ewolButton.cpp
rename to Sources/ewol/widget/Button.cpp
diff --git a/Sources/widget/ewolButton.h b/Sources/ewol/widget/Button.h
similarity index 100%
rename from Sources/widget/ewolButton.h
rename to Sources/ewol/widget/Button.h
diff --git a/Sources/widget/ewolCheckBox.cpp b/Sources/ewol/widget/CheckBox.cpp
similarity index 100%
rename from Sources/widget/ewolCheckBox.cpp
rename to Sources/ewol/widget/CheckBox.cpp
diff --git a/Sources/widget/ewolCheckBox.h b/Sources/ewol/widget/CheckBox.h
similarity index 100%
rename from Sources/widget/ewolCheckBox.h
rename to Sources/ewol/widget/CheckBox.h
diff --git a/Sources/widget/ewolEntry.cpp b/Sources/ewol/widget/Entry.cpp
similarity index 100%
rename from Sources/widget/ewolEntry.cpp
rename to Sources/ewol/widget/Entry.cpp
diff --git a/Sources/widget/ewolEntry.h b/Sources/ewol/widget/Entry.h
similarity index 100%
rename from Sources/widget/ewolEntry.h
rename to Sources/ewol/widget/Entry.h
diff --git a/Sources/widget/ewolList.cpp b/Sources/ewol/widget/List.cpp
similarity index 100%
rename from Sources/widget/ewolList.cpp
rename to Sources/ewol/widget/List.cpp
diff --git a/Sources/widget/ewolList.h b/Sources/ewol/widget/List.h
similarity index 100%
rename from Sources/widget/ewolList.h
rename to Sources/ewol/widget/List.h
diff --git a/Sources/widget/ewolSizerHori.cpp b/Sources/ewol/widget/SizerHori.cpp
similarity index 100%
rename from Sources/widget/ewolSizerHori.cpp
rename to Sources/ewol/widget/SizerHori.cpp
diff --git a/Sources/widget/ewolSizerHori.h b/Sources/ewol/widget/SizerHori.h
similarity index 100%
rename from Sources/widget/ewolSizerHori.h
rename to Sources/ewol/widget/SizerHori.h
diff --git a/Sources/widget/ewolSizerVert.cpp b/Sources/ewol/widget/SizerVert.cpp
similarity index 100%
rename from Sources/widget/ewolSizerVert.cpp
rename to Sources/ewol/widget/SizerVert.cpp
diff --git a/Sources/widget/ewolSizerVert.h b/Sources/ewol/widget/SizerVert.h
similarity index 100%
rename from Sources/widget/ewolSizerVert.h
rename to Sources/ewol/widget/SizerVert.h
diff --git a/Sources/widget/ewolTest.cpp b/Sources/ewol/widget/Test.cpp
similarity index 100%
rename from Sources/widget/ewolTest.cpp
rename to Sources/ewol/widget/Test.cpp
diff --git a/Sources/widget/ewolTest.h b/Sources/ewol/widget/Test.h
similarity index 100%
rename from Sources/widget/ewolTest.h
rename to Sources/ewol/widget/Test.h