diff --git a/src/Painting/GUI/IntelliPhotoGui.cpp b/src/GUI/IntelliPhotoGui.cpp
similarity index 100%
rename from src/Painting/GUI/IntelliPhotoGui.cpp
rename to src/GUI/IntelliPhotoGui.cpp
diff --git a/src/Painting/GUI/IntelliPhotoGui.h b/src/GUI/IntelliPhotoGui.h
similarity index 100%
rename from src/Painting/GUI/IntelliPhotoGui.h
rename to src/GUI/IntelliPhotoGui.h
diff --git a/src/Painting/Image/IntelliImage.cpp b/src/Image/IntelliImage.cpp
similarity index 100%
rename from src/Painting/Image/IntelliImage.cpp
rename to src/Image/IntelliImage.cpp
diff --git a/src/Painting/Image/IntelliImage.h b/src/Image/IntelliImage.h
similarity index 100%
rename from src/Painting/Image/IntelliImage.h
rename to src/Image/IntelliImage.h
diff --git a/src/Painting/Image/IntelliRasterImage.cpp b/src/Image/IntelliRasterImage.cpp
similarity index 100%
rename from src/Painting/Image/IntelliRasterImage.cpp
rename to src/Image/IntelliRasterImage.cpp
diff --git a/src/Painting/Image/IntelliRasterImage.h b/src/Image/IntelliRasterImage.h
similarity index 100%
rename from src/Painting/Image/IntelliRasterImage.h
rename to src/Image/IntelliRasterImage.h
diff --git a/src/Painting/Image/IntelliShapedImage.cpp b/src/Image/IntelliShapedImage.cpp
similarity index 100%
rename from src/Painting/Image/IntelliShapedImage.cpp
rename to src/Image/IntelliShapedImage.cpp
diff --git a/src/Painting/Image/IntelliShapedImage.h b/src/Image/IntelliShapedImage.h
similarity index 100%
rename from src/Painting/Image/IntelliShapedImage.h
rename to src/Image/IntelliShapedImage.h
diff --git a/src/Painting/IntelliHelper/IntelliColorPicker.cpp b/src/IntelliHelper/IntelliColorPicker.cpp
similarity index 100%
rename from src/Painting/IntelliHelper/IntelliColorPicker.cpp
rename to src/IntelliHelper/IntelliColorPicker.cpp
diff --git a/src/Painting/IntelliHelper/IntelliColorPicker.h b/src/IntelliHelper/IntelliColorPicker.h
similarity index 100%
rename from src/Painting/IntelliHelper/IntelliColorPicker.h
rename to src/IntelliHelper/IntelliColorPicker.h
diff --git a/src/Painting/IntelliHelper/IntelliHelper.cpp b/src/IntelliHelper/IntelliHelper.cpp
similarity index 100%
rename from src/Painting/IntelliHelper/IntelliHelper.cpp
rename to src/IntelliHelper/IntelliHelper.cpp
diff --git a/src/Painting/IntelliHelper/IntelliHelper.h b/src/IntelliHelper/IntelliHelper.h
similarity index 100%
rename from src/Painting/IntelliHelper/IntelliHelper.h
rename to src/IntelliHelper/IntelliHelper.h
diff --git a/src/Painting/IntelliPhoto.pro b/src/IntelliPhoto.pro
similarity index 100%
rename from src/Painting/IntelliPhoto.pro
rename to src/IntelliPhoto.pro
diff --git a/src/Painting/Layer/PaintingArea.cpp b/src/Layer/PaintingArea.cpp
similarity index 100%
rename from src/Painting/Layer/PaintingArea.cpp
rename to src/Layer/PaintingArea.cpp
diff --git a/src/Painting/Layer/PaintingArea.h b/src/Layer/PaintingArea.h
similarity index 100%
rename from src/Painting/Layer/PaintingArea.h
rename to src/Layer/PaintingArea.h
diff --git a/src/Painting/Tool/IntelliColorPicker.cpp b/src/Tool/IntelliColorPicker.cpp
similarity index 100%
rename from src/Painting/Tool/IntelliColorPicker.cpp
rename to src/Tool/IntelliColorPicker.cpp
diff --git a/src/Painting/Tool/IntelliTool.cpp b/src/Tool/IntelliTool.cpp
similarity index 100%
rename from src/Painting/Tool/IntelliTool.cpp
rename to src/Tool/IntelliTool.cpp
diff --git a/src/Painting/Tool/IntelliTool.h b/src/Tool/IntelliTool.h
similarity index 100%
rename from src/Painting/Tool/IntelliTool.h
rename to src/Tool/IntelliTool.h
diff --git a/src/Painting/Tool/IntelliToolLine.cpp b/src/Tool/IntelliToolLine.cpp
similarity index 100%
rename from src/Painting/Tool/IntelliToolLine.cpp
rename to src/Tool/IntelliToolLine.cpp
diff --git a/src/Painting/Tool/IntelliToolLine.h b/src/Tool/IntelliToolLine.h
similarity index 100%
rename from src/Painting/Tool/IntelliToolLine.h
rename to src/Tool/IntelliToolLine.h
diff --git a/src/Painting/Tool/IntelliToolPen.cpp b/src/Tool/IntelliToolPen.cpp
similarity index 100%
rename from src/Painting/Tool/IntelliToolPen.cpp
rename to src/Tool/IntelliToolPen.cpp
diff --git a/src/Painting/Tool/IntelliToolPen.h b/src/Tool/IntelliToolPen.h
similarity index 100%
rename from src/Painting/Tool/IntelliToolPen.h
rename to src/Tool/IntelliToolPen.h
diff --git a/src/Painting/Tool/IntelliToolPlain.cpp b/src/Tool/IntelliToolPlain.cpp
similarity index 100%
rename from src/Painting/Tool/IntelliToolPlain.cpp
rename to src/Tool/IntelliToolPlain.cpp
diff --git a/src/Painting/Tool/IntelliToolPlain.h b/src/Tool/IntelliToolPlain.h
similarity index 100%
rename from src/Painting/Tool/IntelliToolPlain.h
rename to src/Tool/IntelliToolPlain.h
diff --git a/src/Painting/icon.icns b/src/icon.icns
similarity index 100%
rename from src/Painting/icon.icns
rename to src/icon.icns
diff --git a/src/Painting/icon.ico b/src/icon.ico
similarity index 100%
rename from src/Painting/icon.ico
rename to src/icon.ico
diff --git a/src/Painting/main.cpp b/src/main.cpp
similarity index 100%
rename from src/Painting/main.cpp
rename to src/main.cpp
diff --git a/src/Painting/widget.ui b/src/widget.ui
similarity index 100%
rename from src/Painting/widget.ui
rename to src/widget.ui