diff --git a/src/servers/app/Painter/NOTES b/src/servers/app/drawing/Painter/NOTES
similarity index 100%
rename from src/servers/app/Painter/NOTES
rename to src/servers/app/drawing/Painter/NOTES
diff --git a/src/servers/app/Painter/Painter.cpp b/src/servers/app/drawing/Painter/Painter.cpp
similarity index 100%
rename from src/servers/app/Painter/Painter.cpp
rename to src/servers/app/drawing/Painter/Painter.cpp
diff --git a/src/servers/app/Painter/README b/src/servers/app/drawing/Painter/README
similarity index 100%
rename from src/servers/app/Painter/README
rename to src/servers/app/drawing/Painter/README
diff --git a/src/servers/app/Painter/ShapeConverter.cpp b/src/servers/app/drawing/Painter/ShapeConverter.cpp
similarity index 100%
rename from src/servers/app/Painter/ShapeConverter.cpp
rename to src/servers/app/drawing/Painter/ShapeConverter.cpp
diff --git a/src/servers/app/Painter/ShapeConverter.h b/src/servers/app/drawing/Painter/ShapeConverter.h
similarity index 100%
rename from src/servers/app/Painter/ShapeConverter.h
rename to src/servers/app/drawing/Painter/ShapeConverter.h
diff --git a/src/servers/app/Painter/TODO b/src/servers/app/drawing/Painter/TODO
similarity index 100%
rename from src/servers/app/Painter/TODO
rename to src/servers/app/drawing/Painter/TODO
diff --git a/src/servers/app/Painter/Transformable.cpp b/src/servers/app/drawing/Painter/Transformable.cpp
similarity index 100%
rename from src/servers/app/Painter/Transformable.cpp
rename to src/servers/app/drawing/Painter/Transformable.cpp
diff --git a/src/servers/app/Painter/Transformable.h b/src/servers/app/drawing/Painter/Transformable.h
similarity index 100%
rename from src/servers/app/Painter/Transformable.h
rename to src/servers/app/drawing/Painter/Transformable.h
diff --git a/src/servers/app/Painter/defines.h b/src/servers/app/drawing/Painter/defines.h
similarity index 100%
rename from src/servers/app/Painter/defines.h
rename to src/servers/app/drawing/Painter/defines.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingMode.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingMode.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingMode.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingMode.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeAdd.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAdd.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeAdd.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeAdd.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeAlphaCC.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCC.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeAlphaCC.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCC.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeAlphaCO.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCO.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeAlphaCO.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaCO.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeAlphaPC.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaPC.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeAlphaPC.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaPC.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeAlphaPO.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaPO.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeAlphaPO.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeAlphaPO.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeBlend.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeBlend.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeBlend.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeBlend.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeCopy.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopy.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeCopy.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopy.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeCopySolid.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopySolid.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeCopySolid.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeCopySolid.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeErase.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeErase.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeErase.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeErase.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeFactory.cpp b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeFactory.cpp
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeFactory.cpp
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeFactory.cpp
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeFactory.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeFactory.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeFactory.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeFactory.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeInvert.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvert.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeInvert.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeInvert.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeMax.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeMax.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeMax.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeMax.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeMin.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeMin.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeMin.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeMin.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeOver.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeOver.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeOver.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeOver.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeSelect.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelect.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeSelect.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeSelect.h
diff --git a/src/servers/app/Painter/drawing_modes/DrawingModeSubtract.h b/src/servers/app/drawing/Painter/drawing_modes/DrawingModeSubtract.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/DrawingModeSubtract.h
rename to src/servers/app/drawing/Painter/drawing_modes/DrawingModeSubtract.h
diff --git a/src/servers/app/Painter/drawing_modes/_for_reference_.h b/src/servers/app/drawing/Painter/drawing_modes/_for_reference_.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/_for_reference_.h
rename to src/servers/app/drawing/Painter/drawing_modes/_for_reference_.h
diff --git a/src/servers/app/Painter/drawing_modes/forwarding_pixfmt.h b/src/servers/app/drawing/Painter/drawing_modes/forwarding_pixfmt.h
similarity index 100%
rename from src/servers/app/Painter/drawing_modes/forwarding_pixfmt.h
rename to src/servers/app/drawing/Painter/drawing_modes/forwarding_pixfmt.h
diff --git a/src/servers/app/Painter/font_support/AGGTextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
similarity index 100%
rename from src/servers/app/Painter/font_support/AGGTextRenderer.cpp
rename to src/servers/app/drawing/Painter/font_support/AGGTextRenderer.cpp
diff --git a/src/servers/app/Painter/font_support/AGGTextRenderer.h b/src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
similarity index 100%
rename from src/servers/app/Painter/font_support/AGGTextRenderer.h
rename to src/servers/app/drawing/Painter/font_support/AGGTextRenderer.h
diff --git a/src/servers/app/Painter/font_support/FontManager.cpp b/src/servers/app/drawing/Painter/font_support/FontManager.cpp
similarity index 100%
rename from src/servers/app/Painter/font_support/FontManager.cpp
rename to src/servers/app/drawing/Painter/font_support/FontManager.cpp
diff --git a/src/servers/app/Painter/font_support/FontManager.h b/src/servers/app/drawing/Painter/font_support/FontManager.h
similarity index 100%
rename from src/servers/app/Painter/font_support/FontManager.h
rename to src/servers/app/drawing/Painter/font_support/FontManager.h
diff --git a/src/servers/app/Painter/font_support/TextRenderer.cpp b/src/servers/app/drawing/Painter/font_support/TextRenderer.cpp
similarity index 100%
rename from src/servers/app/Painter/font_support/TextRenderer.cpp
rename to src/servers/app/drawing/Painter/font_support/TextRenderer.cpp
diff --git a/src/servers/app/Painter/font_support/TextRenderer.h b/src/servers/app/drawing/Painter/font_support/TextRenderer.h
similarity index 100%
rename from src/servers/app/Painter/font_support/TextRenderer.h
rename to src/servers/app/drawing/Painter/font_support/TextRenderer.h
diff --git a/src/servers/app/Painter/font_support/agg_font_freetype.cpp b/src/servers/app/drawing/Painter/font_support/agg_font_freetype.cpp
similarity index 100%
rename from src/servers/app/Painter/font_support/agg_font_freetype.cpp
rename to src/servers/app/drawing/Painter/font_support/agg_font_freetype.cpp
diff --git a/src/servers/app/Painter/font_support/agg_font_freetype.h b/src/servers/app/drawing/Painter/font_support/agg_font_freetype.h
similarity index 100%
rename from src/servers/app/Painter/font_support/agg_font_freetype.h
rename to src/servers/app/drawing/Painter/font_support/agg_font_freetype.h