diff --git a/uppdev/Painter/Approximate.cpp b/uppsrc/Painter/Approximate.cpp
similarity index 100%
rename from uppdev/Painter/Approximate.cpp
rename to uppsrc/Painter/Approximate.cpp
diff --git a/uppdev/Painter/BufferPainter.h b/uppsrc/Painter/BufferPainter.h
similarity index 100%
rename from uppdev/Painter/BufferPainter.h
rename to uppsrc/Painter/BufferPainter.h
diff --git a/uppdev/Painter/Context.cpp b/uppsrc/Painter/Context.cpp
similarity index 100%
rename from uppdev/Painter/Context.cpp
rename to uppsrc/Painter/Context.cpp
diff --git a/uppdev/Painter/Dasher.cpp b/uppsrc/Painter/Dasher.cpp
similarity index 100%
rename from uppdev/Painter/Dasher.cpp
rename to uppsrc/Painter/Dasher.cpp
diff --git a/uppdev/Painter/DrawOp.cpp b/uppsrc/Painter/DrawOp.cpp
similarity index 100%
rename from uppdev/Painter/DrawOp.cpp
rename to uppsrc/Painter/DrawOp.cpp
diff --git a/uppdev/Painter/Fillers.cpp b/uppsrc/Painter/Fillers.cpp
similarity index 100%
rename from uppdev/Painter/Fillers.cpp
rename to uppsrc/Painter/Fillers.cpp
diff --git a/uppdev/Painter/Fillers.h b/uppsrc/Painter/Fillers.h
similarity index 100%
rename from uppdev/Painter/Fillers.h
rename to uppsrc/Painter/Fillers.h
diff --git a/uppdev/Painter/FontWin32.cpp b/uppsrc/Painter/FontWin32.cpp
similarity index 100%
rename from uppdev/Painter/FontWin32.cpp
rename to uppsrc/Painter/FontWin32.cpp
diff --git a/uppdev/Painter/FontX11.cpp b/uppsrc/Painter/FontX11.cpp
similarity index 100%
rename from uppdev/Painter/FontX11.cpp
rename to uppsrc/Painter/FontX11.cpp
diff --git a/uppdev/Painter/Gradient.cpp b/uppsrc/Painter/Gradient.cpp
similarity index 100%
rename from uppdev/Painter/Gradient.cpp
rename to uppsrc/Painter/Gradient.cpp
diff --git a/uppdev/Painter/Image.cpp b/uppsrc/Painter/Image.cpp
similarity index 100%
rename from uppdev/Painter/Image.cpp
rename to uppsrc/Painter/Image.cpp
diff --git a/uppdev/Painter/Interpolator.cpp b/uppsrc/Painter/Interpolator.cpp
similarity index 100%
rename from uppdev/Painter/Interpolator.cpp
rename to uppsrc/Painter/Interpolator.cpp
diff --git a/uppdev/Painter/Mask.cpp b/uppsrc/Painter/Mask.cpp
similarity index 100%
rename from uppdev/Painter/Mask.cpp
rename to uppsrc/Painter/Mask.cpp
diff --git a/uppdev/Painter/Math.cpp b/uppsrc/Painter/Math.cpp
similarity index 100%
rename from uppdev/Painter/Math.cpp
rename to uppsrc/Painter/Math.cpp
diff --git a/uppdev/Painter/PaintPainting.icpp b/uppsrc/Painter/PaintPainting.icpp
similarity index 100%
rename from uppdev/Painter/PaintPainting.icpp
rename to uppsrc/Painter/PaintPainting.icpp
diff --git a/uppdev/Painter/Painter.cpp b/uppsrc/Painter/Painter.cpp
similarity index 100%
rename from uppdev/Painter/Painter.cpp
rename to uppsrc/Painter/Painter.cpp
diff --git a/uppdev/Painter/Painter.h b/uppsrc/Painter/Painter.h
similarity index 100%
rename from uppdev/Painter/Painter.h
rename to uppsrc/Painter/Painter.h
diff --git a/uppdev/Painter/Painter.hpp b/uppsrc/Painter/Painter.hpp
similarity index 100%
rename from uppdev/Painter/Painter.hpp
rename to uppsrc/Painter/Painter.hpp
diff --git a/uppdev/Painter/Painter.upp b/uppsrc/Painter/Painter.upp
similarity index 100%
rename from uppdev/Painter/Painter.upp
rename to uppsrc/Painter/Painter.upp
diff --git a/uppdev/Painter/PainterPath.cpp b/uppsrc/Painter/PainterPath.cpp
similarity index 100%
rename from uppdev/Painter/PainterPath.cpp
rename to uppsrc/Painter/PainterPath.cpp
diff --git a/uppdev/Painter/Painting.cpp b/uppsrc/Painter/Painting.cpp
similarity index 100%
rename from uppdev/Painter/Painting.cpp
rename to uppsrc/Painter/Painting.cpp
diff --git a/uppdev/Painter/Painting.h b/uppsrc/Painter/Painting.h
similarity index 100%
rename from uppdev/Painter/Painting.h
rename to uppsrc/Painter/Painting.h
diff --git a/uppdev/Painter/Path.cpp b/uppsrc/Painter/Path.cpp
similarity index 100%
rename from uppdev/Painter/Path.cpp
rename to uppsrc/Painter/Path.cpp
diff --git a/uppdev/Painter/RadialGradient.cpp b/uppsrc/Painter/RadialGradient.cpp
similarity index 100%
rename from uppdev/Painter/RadialGradient.cpp
rename to uppsrc/Painter/RadialGradient.cpp
diff --git a/uppdev/Painter/Rasterizer.cpp b/uppsrc/Painter/Rasterizer.cpp
similarity index 100%
rename from uppdev/Painter/Rasterizer.cpp
rename to uppsrc/Painter/Rasterizer.cpp
diff --git a/uppdev/Painter/Rasterizer3.h b/uppsrc/Painter/Rasterizer3.h
similarity index 100%
rename from uppdev/Painter/Rasterizer3.h
rename to uppsrc/Painter/Rasterizer3.h
diff --git a/uppdev/Painter/RasterizerClip.cpp b/uppsrc/Painter/RasterizerClip.cpp
similarity index 100%
rename from uppdev/Painter/RasterizerClip.cpp
rename to uppsrc/Painter/RasterizerClip.cpp
diff --git a/uppdev/Painter/Render.cpp b/uppsrc/Painter/Render.cpp
similarity index 100%
rename from uppdev/Painter/Render.cpp
rename to uppsrc/Painter/Render.cpp
diff --git a/uppdev/Painter/Stroker.cpp b/uppsrc/Painter/Stroker.cpp
similarity index 100%
rename from uppdev/Painter/Stroker.cpp
rename to uppsrc/Painter/Stroker.cpp
diff --git a/uppdev/Painter/Transformer.cpp b/uppsrc/Painter/Transformer.cpp
similarity index 100%
rename from uppdev/Painter/Transformer.cpp
rename to uppsrc/Painter/Transformer.cpp
diff --git a/uppdev/Painter/Xform2D.cpp b/uppsrc/Painter/Xform2D.cpp
similarity index 100%
rename from uppdev/Painter/Xform2D.cpp
rename to uppsrc/Painter/Xform2D.cpp
diff --git a/uppdev/Painter/init b/uppsrc/Painter/init
similarity index 100%
rename from uppdev/Painter/init
rename to uppsrc/Painter/init