diff --git a/reactos/base/applications/CMakeLists.txt b/reactos/base/applications/CMakeLists.txt index 6c0673e37c1..f834c6dcbbf 100644 --- a/reactos/base/applications/CMakeLists.txt +++ b/reactos/base/applications/CMakeLists.txt @@ -19,7 +19,7 @@ add_subdirectory(mmc) add_subdirectory(mplay32) add_subdirectory(msconfig) add_subdirectory(mscutils) -add_subdirectory(mspaint_new) +add_subdirectory(mspaint) add_subdirectory(mstsc) add_subdirectory(network) add_subdirectory(notepad) diff --git a/reactos/base/applications/mspaint_new/CMakeLists.txt b/reactos/base/applications/mspaint/CMakeLists.txt similarity index 100% rename from reactos/base/applications/mspaint_new/CMakeLists.txt rename to reactos/base/applications/mspaint/CMakeLists.txt diff --git a/reactos/base/applications/mspaint_new/definitions.h b/reactos/base/applications/mspaint/definitions.h similarity index 100% rename from reactos/base/applications/mspaint_new/definitions.h rename to reactos/base/applications/mspaint/definitions.h diff --git a/reactos/base/applications/mspaint_new/dialogs.cpp b/reactos/base/applications/mspaint/dialogs.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/dialogs.cpp rename to reactos/base/applications/mspaint/dialogs.cpp diff --git a/reactos/base/applications/mspaint_new/dialogs.h b/reactos/base/applications/mspaint/dialogs.h similarity index 100% rename from reactos/base/applications/mspaint_new/dialogs.h rename to reactos/base/applications/mspaint/dialogs.h diff --git a/reactos/base/applications/mspaint_new/dib.cpp b/reactos/base/applications/mspaint/dib.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/dib.cpp rename to reactos/base/applications/mspaint/dib.cpp diff --git a/reactos/base/applications/mspaint_new/dib.h b/reactos/base/applications/mspaint/dib.h similarity index 100% rename from reactos/base/applications/mspaint_new/dib.h rename to reactos/base/applications/mspaint/dib.h diff --git a/reactos/base/applications/mspaint_new/drawing.cpp b/reactos/base/applications/mspaint/drawing.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/drawing.cpp rename to reactos/base/applications/mspaint/drawing.cpp diff --git a/reactos/base/applications/mspaint_new/drawing.h b/reactos/base/applications/mspaint/drawing.h similarity index 100% rename from reactos/base/applications/mspaint_new/drawing.h rename to reactos/base/applications/mspaint/drawing.h diff --git a/reactos/base/applications/mspaint_new/fullscreen.cpp b/reactos/base/applications/mspaint/fullscreen.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/fullscreen.cpp rename to reactos/base/applications/mspaint/fullscreen.cpp diff --git a/reactos/base/applications/mspaint_new/fullscreen.h b/reactos/base/applications/mspaint/fullscreen.h similarity index 100% rename from reactos/base/applications/mspaint_new/fullscreen.h rename to reactos/base/applications/mspaint/fullscreen.h diff --git a/reactos/base/applications/mspaint_new/globalvar.h b/reactos/base/applications/mspaint/globalvar.h similarity index 100% rename from reactos/base/applications/mspaint_new/globalvar.h rename to reactos/base/applications/mspaint/globalvar.h diff --git a/reactos/base/applications/mspaint_new/help/Paint.chm b/reactos/base/applications/mspaint/help/Paint.chm similarity index 100% rename from reactos/base/applications/mspaint_new/help/Paint.chm rename to reactos/base/applications/mspaint/help/Paint.chm diff --git a/reactos/base/applications/mspaint_new/help/Paint.hhp b/reactos/base/applications/mspaint/help/Paint.hhp similarity index 100% rename from reactos/base/applications/mspaint_new/help/Paint.hhp rename to reactos/base/applications/mspaint/help/Paint.hhp diff --git a/reactos/base/applications/mspaint_new/help/Paint_all_files.hhp b/reactos/base/applications/mspaint/help/Paint_all_files.hhp similarity index 100% rename from reactos/base/applications/mspaint_new/help/Paint_all_files.hhp rename to reactos/base/applications/mspaint/help/Paint_all_files.hhp diff --git a/reactos/base/applications/mspaint_new/help/Table of Contents.hhc b/reactos/base/applications/mspaint/help/Table of Contents.hhc similarity index 100% rename from reactos/base/applications/mspaint_new/help/Table of Contents.hhc rename to reactos/base/applications/mspaint/help/Table of Contents.hhc diff --git a/reactos/base/applications/mspaint_new/help/airbrush.png b/reactos/base/applications/mspaint/help/airbrush.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/airbrush.png rename to reactos/base/applications/mspaint/help/airbrush.png diff --git a/reactos/base/applications/mspaint_new/help/appwindow.png b/reactos/base/applications/mspaint/help/appwindow.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/appwindow.png rename to reactos/base/applications/mspaint/help/appwindow.png diff --git a/reactos/base/applications/mspaint_new/help/bezier.png b/reactos/base/applications/mspaint/help/bezier.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/bezier.png rename to reactos/base/applications/mspaint/help/bezier.png diff --git a/reactos/base/applications/mspaint_new/help/brush.png b/reactos/base/applications/mspaint/help/brush.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/brush.png rename to reactos/base/applications/mspaint/help/brush.png diff --git a/reactos/base/applications/mspaint_new/help/color.png b/reactos/base/applications/mspaint/help/color.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/color.png rename to reactos/base/applications/mspaint/help/color.png diff --git a/reactos/base/applications/mspaint_new/help/ellipse.png b/reactos/base/applications/mspaint/help/ellipse.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/ellipse.png rename to reactos/base/applications/mspaint/help/ellipse.png diff --git a/reactos/base/applications/mspaint_new/help/fill.png b/reactos/base/applications/mspaint/help/fill.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/fill.png rename to reactos/base/applications/mspaint/help/fill.png diff --git a/reactos/base/applications/mspaint_new/help/freesel.png b/reactos/base/applications/mspaint/help/freesel.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/freesel.png rename to reactos/base/applications/mspaint/help/freesel.png diff --git a/reactos/base/applications/mspaint_new/help/line.png b/reactos/base/applications/mspaint/help/line.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/line.png rename to reactos/base/applications/mspaint/help/line.png diff --git a/reactos/base/applications/mspaint_new/help/palette.png b/reactos/base/applications/mspaint/help/palette.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/palette.png rename to reactos/base/applications/mspaint/help/palette.png diff --git a/reactos/base/applications/mspaint_new/help/pen.png b/reactos/base/applications/mspaint/help/pen.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/pen.png rename to reactos/base/applications/mspaint/help/pen.png diff --git a/reactos/base/applications/mspaint_new/help/rect.png b/reactos/base/applications/mspaint/help/rect.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/rect.png rename to reactos/base/applications/mspaint/help/rect.png diff --git a/reactos/base/applications/mspaint_new/help/rectsel.png b/reactos/base/applications/mspaint/help/rectsel.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/rectsel.png rename to reactos/base/applications/mspaint/help/rectsel.png diff --git a/reactos/base/applications/mspaint_new/help/rrect.png b/reactos/base/applications/mspaint/help/rrect.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/rrect.png rename to reactos/base/applications/mspaint/help/rrect.png diff --git a/reactos/base/applications/mspaint_new/help/rubber.png b/reactos/base/applications/mspaint/help/rubber.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/rubber.png rename to reactos/base/applications/mspaint/help/rubber.png diff --git a/reactos/base/applications/mspaint_new/help/settings.html b/reactos/base/applications/mspaint/help/settings.html similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings.html rename to reactos/base/applications/mspaint/help/settings.html diff --git a/reactos/base/applications/mspaint_new/help/settings1.png b/reactos/base/applications/mspaint/help/settings1.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings1.png rename to reactos/base/applications/mspaint/help/settings1.png diff --git a/reactos/base/applications/mspaint_new/help/settings2.png b/reactos/base/applications/mspaint/help/settings2.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings2.png rename to reactos/base/applications/mspaint/help/settings2.png diff --git a/reactos/base/applications/mspaint_new/help/settings3.png b/reactos/base/applications/mspaint/help/settings3.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings3.png rename to reactos/base/applications/mspaint/help/settings3.png diff --git a/reactos/base/applications/mspaint_new/help/settings4.png b/reactos/base/applications/mspaint/help/settings4.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings4.png rename to reactos/base/applications/mspaint/help/settings4.png diff --git a/reactos/base/applications/mspaint_new/help/settings5.png b/reactos/base/applications/mspaint/help/settings5.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings5.png rename to reactos/base/applications/mspaint/help/settings5.png diff --git a/reactos/base/applications/mspaint_new/help/settings6.png b/reactos/base/applications/mspaint/help/settings6.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/settings6.png rename to reactos/base/applications/mspaint/help/settings6.png diff --git a/reactos/base/applications/mspaint_new/help/shape.png b/reactos/base/applications/mspaint/help/shape.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/shape.png rename to reactos/base/applications/mspaint/help/shape.png diff --git a/reactos/base/applications/mspaint_new/help/text.png b/reactos/base/applications/mspaint/help/text.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/text.png rename to reactos/base/applications/mspaint/help/text.png diff --git a/reactos/base/applications/mspaint_new/help/toolbox.png b/reactos/base/applications/mspaint/help/toolbox.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/toolbox.png rename to reactos/base/applications/mspaint/help/toolbox.png diff --git a/reactos/base/applications/mspaint_new/help/tools.html b/reactos/base/applications/mspaint/help/tools.html similarity index 100% rename from reactos/base/applications/mspaint_new/help/tools.html rename to reactos/base/applications/mspaint/help/tools.html diff --git a/reactos/base/applications/mspaint_new/help/usage.html b/reactos/base/applications/mspaint/help/usage.html similarity index 100% rename from reactos/base/applications/mspaint_new/help/usage.html rename to reactos/base/applications/mspaint/help/usage.html diff --git a/reactos/base/applications/mspaint_new/help/zoom.png b/reactos/base/applications/mspaint/help/zoom.png similarity index 100% rename from reactos/base/applications/mspaint_new/help/zoom.png rename to reactos/base/applications/mspaint/help/zoom.png diff --git a/reactos/base/applications/mspaint_new/history.cpp b/reactos/base/applications/mspaint/history.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/history.cpp rename to reactos/base/applications/mspaint/history.cpp diff --git a/reactos/base/applications/mspaint_new/history.h b/reactos/base/applications/mspaint/history.h similarity index 100% rename from reactos/base/applications/mspaint_new/history.h rename to reactos/base/applications/mspaint/history.h diff --git a/reactos/base/applications/mspaint_new/icons/airbrush_cur.ico b/reactos/base/applications/mspaint/icons/airbrush_cur.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/airbrush_cur.ico rename to reactos/base/applications/mspaint/icons/airbrush_cur.ico diff --git a/reactos/base/applications/mspaint_new/icons/color_cur.ico b/reactos/base/applications/mspaint/icons/color_cur.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/color_cur.ico rename to reactos/base/applications/mspaint/icons/color_cur.ico diff --git a/reactos/base/applications/mspaint_new/icons/fill_cur.ico b/reactos/base/applications/mspaint/icons/fill_cur.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/fill_cur.ico rename to reactos/base/applications/mspaint/icons/fill_cur.ico diff --git a/reactos/base/applications/mspaint_new/icons/horzskew.ico b/reactos/base/applications/mspaint/icons/horzskew.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/horzskew.ico rename to reactos/base/applications/mspaint/icons/horzskew.ico diff --git a/reactos/base/applications/mspaint_new/icons/horzstretch.ico b/reactos/base/applications/mspaint/icons/horzstretch.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/horzstretch.ico rename to reactos/base/applications/mspaint/icons/horzstretch.ico diff --git a/reactos/base/applications/mspaint_new/icons/iconbar.bmp b/reactos/base/applications/mspaint/icons/iconbar.bmp similarity index 100% rename from reactos/base/applications/mspaint_new/icons/iconbar.bmp rename to reactos/base/applications/mspaint/icons/iconbar.bmp diff --git a/reactos/base/applications/mspaint_new/icons/nontransparent.ico b/reactos/base/applications/mspaint/icons/nontransparent.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/nontransparent.ico rename to reactos/base/applications/mspaint/icons/nontransparent.ico diff --git a/reactos/base/applications/mspaint_new/icons/paint.ico b/reactos/base/applications/mspaint/icons/paint.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/paint.ico rename to reactos/base/applications/mspaint/icons/paint.ico diff --git a/reactos/base/applications/mspaint_new/icons/paint.svg b/reactos/base/applications/mspaint/icons/paint.svg similarity index 100% rename from reactos/base/applications/mspaint_new/icons/paint.svg rename to reactos/base/applications/mspaint/icons/paint.svg diff --git a/reactos/base/applications/mspaint_new/icons/pen_cur.ico b/reactos/base/applications/mspaint/icons/pen_cur.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/pen_cur.ico rename to reactos/base/applications/mspaint/icons/pen_cur.ico diff --git a/reactos/base/applications/mspaint_new/icons/transparency.xcf b/reactos/base/applications/mspaint/icons/transparency.xcf similarity index 100% rename from reactos/base/applications/mspaint_new/icons/transparency.xcf rename to reactos/base/applications/mspaint/icons/transparency.xcf diff --git a/reactos/base/applications/mspaint_new/icons/transparent.ico b/reactos/base/applications/mspaint/icons/transparent.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/transparent.ico rename to reactos/base/applications/mspaint/icons/transparent.ico diff --git a/reactos/base/applications/mspaint_new/icons/vertskew.ico b/reactos/base/applications/mspaint/icons/vertskew.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/vertskew.ico rename to reactos/base/applications/mspaint/icons/vertskew.ico diff --git a/reactos/base/applications/mspaint_new/icons/vertstretch.ico b/reactos/base/applications/mspaint/icons/vertstretch.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/vertstretch.ico rename to reactos/base/applications/mspaint/icons/vertstretch.ico diff --git a/reactos/base/applications/mspaint_new/icons/zoom_cur.ico b/reactos/base/applications/mspaint/icons/zoom_cur.ico similarity index 100% rename from reactos/base/applications/mspaint_new/icons/zoom_cur.ico rename to reactos/base/applications/mspaint/icons/zoom_cur.ico diff --git a/reactos/base/applications/mspaint_new/imgarea.cpp b/reactos/base/applications/mspaint/imgarea.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/imgarea.cpp rename to reactos/base/applications/mspaint/imgarea.cpp diff --git a/reactos/base/applications/mspaint_new/imgarea.h b/reactos/base/applications/mspaint/imgarea.h similarity index 100% rename from reactos/base/applications/mspaint_new/imgarea.h rename to reactos/base/applications/mspaint/imgarea.h diff --git a/reactos/base/applications/mspaint_new/lang/bg-BG.rc b/reactos/base/applications/mspaint/lang/bg-BG.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/bg-BG.rc rename to reactos/base/applications/mspaint/lang/bg-BG.rc diff --git a/reactos/base/applications/mspaint_new/lang/cs-CZ.rc b/reactos/base/applications/mspaint/lang/cs-CZ.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/cs-CZ.rc rename to reactos/base/applications/mspaint/lang/cs-CZ.rc diff --git a/reactos/base/applications/mspaint_new/lang/de-DE.rc b/reactos/base/applications/mspaint/lang/de-DE.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/de-DE.rc rename to reactos/base/applications/mspaint/lang/de-DE.rc diff --git a/reactos/base/applications/mspaint_new/lang/en-GB.rc b/reactos/base/applications/mspaint/lang/en-GB.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/en-GB.rc rename to reactos/base/applications/mspaint/lang/en-GB.rc diff --git a/reactos/base/applications/mspaint_new/lang/en-US.rc b/reactos/base/applications/mspaint/lang/en-US.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/en-US.rc rename to reactos/base/applications/mspaint/lang/en-US.rc diff --git a/reactos/base/applications/mspaint_new/lang/es-ES.rc b/reactos/base/applications/mspaint/lang/es-ES.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/es-ES.rc rename to reactos/base/applications/mspaint/lang/es-ES.rc diff --git a/reactos/base/applications/mspaint_new/lang/eu-ES.rc b/reactos/base/applications/mspaint/lang/eu-ES.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/eu-ES.rc rename to reactos/base/applications/mspaint/lang/eu-ES.rc diff --git a/reactos/base/applications/mspaint_new/lang/fr-FR.rc b/reactos/base/applications/mspaint/lang/fr-FR.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/fr-FR.rc rename to reactos/base/applications/mspaint/lang/fr-FR.rc diff --git a/reactos/base/applications/mspaint_new/lang/he-IL.rc b/reactos/base/applications/mspaint/lang/he-IL.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/he-IL.rc rename to reactos/base/applications/mspaint/lang/he-IL.rc diff --git a/reactos/base/applications/mspaint_new/lang/hu-HU.rc b/reactos/base/applications/mspaint/lang/hu-HU.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/hu-HU.rc rename to reactos/base/applications/mspaint/lang/hu-HU.rc diff --git a/reactos/base/applications/mspaint_new/lang/it-IT.rc b/reactos/base/applications/mspaint/lang/it-IT.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/it-IT.rc rename to reactos/base/applications/mspaint/lang/it-IT.rc diff --git a/reactos/base/applications/mspaint_new/lang/ja-JP.rc b/reactos/base/applications/mspaint/lang/ja-JP.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/ja-JP.rc rename to reactos/base/applications/mspaint/lang/ja-JP.rc diff --git a/reactos/base/applications/mspaint_new/lang/nl-NL.rc b/reactos/base/applications/mspaint/lang/nl-NL.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/nl-NL.rc rename to reactos/base/applications/mspaint/lang/nl-NL.rc diff --git a/reactos/base/applications/mspaint_new/lang/no-NO.rc b/reactos/base/applications/mspaint/lang/no-NO.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/no-NO.rc rename to reactos/base/applications/mspaint/lang/no-NO.rc diff --git a/reactos/base/applications/mspaint_new/lang/pl-PL.rc b/reactos/base/applications/mspaint/lang/pl-PL.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/pl-PL.rc rename to reactos/base/applications/mspaint/lang/pl-PL.rc diff --git a/reactos/base/applications/mspaint_new/lang/pt-BR.rc b/reactos/base/applications/mspaint/lang/pt-BR.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/pt-BR.rc rename to reactos/base/applications/mspaint/lang/pt-BR.rc diff --git a/reactos/base/applications/mspaint_new/lang/pt-PT.rc b/reactos/base/applications/mspaint/lang/pt-PT.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/pt-PT.rc rename to reactos/base/applications/mspaint/lang/pt-PT.rc diff --git a/reactos/base/applications/mspaint_new/lang/ro-RO.rc b/reactos/base/applications/mspaint/lang/ro-RO.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/ro-RO.rc rename to reactos/base/applications/mspaint/lang/ro-RO.rc diff --git a/reactos/base/applications/mspaint_new/lang/ru-RU.rc b/reactos/base/applications/mspaint/lang/ru-RU.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/ru-RU.rc rename to reactos/base/applications/mspaint/lang/ru-RU.rc diff --git a/reactos/base/applications/mspaint_new/lang/sk-SK.rc b/reactos/base/applications/mspaint/lang/sk-SK.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/sk-SK.rc rename to reactos/base/applications/mspaint/lang/sk-SK.rc diff --git a/reactos/base/applications/mspaint_new/lang/sq-AL.rc b/reactos/base/applications/mspaint/lang/sq-AL.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/sq-AL.rc rename to reactos/base/applications/mspaint/lang/sq-AL.rc diff --git a/reactos/base/applications/mspaint_new/lang/sv-SE.rc b/reactos/base/applications/mspaint/lang/sv-SE.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/sv-SE.rc rename to reactos/base/applications/mspaint/lang/sv-SE.rc diff --git a/reactos/base/applications/mspaint_new/lang/tr-TR.rc b/reactos/base/applications/mspaint/lang/tr-TR.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/tr-TR.rc rename to reactos/base/applications/mspaint/lang/tr-TR.rc diff --git a/reactos/base/applications/mspaint_new/lang/uk-UA.rc b/reactos/base/applications/mspaint/lang/uk-UA.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/uk-UA.rc rename to reactos/base/applications/mspaint/lang/uk-UA.rc diff --git a/reactos/base/applications/mspaint_new/lang/zh-CN.rc b/reactos/base/applications/mspaint/lang/zh-CN.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/zh-CN.rc rename to reactos/base/applications/mspaint/lang/zh-CN.rc diff --git a/reactos/base/applications/mspaint_new/lang/zh-TW.rc b/reactos/base/applications/mspaint/lang/zh-TW.rc similarity index 100% rename from reactos/base/applications/mspaint_new/lang/zh-TW.rc rename to reactos/base/applications/mspaint/lang/zh-TW.rc diff --git a/reactos/base/applications/mspaint_new/main.cpp b/reactos/base/applications/mspaint/main.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/main.cpp rename to reactos/base/applications/mspaint/main.cpp diff --git a/reactos/base/applications/mspaint_new/miniature.cpp b/reactos/base/applications/mspaint/miniature.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/miniature.cpp rename to reactos/base/applications/mspaint/miniature.cpp diff --git a/reactos/base/applications/mspaint_new/miniature.h b/reactos/base/applications/mspaint/miniature.h similarity index 100% rename from reactos/base/applications/mspaint_new/miniature.h rename to reactos/base/applications/mspaint/miniature.h diff --git a/reactos/base/applications/mspaint_new/mouse.cpp b/reactos/base/applications/mspaint/mouse.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/mouse.cpp rename to reactos/base/applications/mspaint/mouse.cpp diff --git a/reactos/base/applications/mspaint_new/mouse.h b/reactos/base/applications/mspaint/mouse.h similarity index 100% rename from reactos/base/applications/mspaint_new/mouse.h rename to reactos/base/applications/mspaint/mouse.h diff --git a/reactos/base/applications/mspaint_new/mspaint.exe.amd64.manifest b/reactos/base/applications/mspaint/mspaint.exe.amd64.manifest similarity index 100% rename from reactos/base/applications/mspaint_new/mspaint.exe.amd64.manifest rename to reactos/base/applications/mspaint/mspaint.exe.amd64.manifest diff --git a/reactos/base/applications/mspaint_new/mspaint.exe.manifest b/reactos/base/applications/mspaint/mspaint.exe.manifest similarity index 100% rename from reactos/base/applications/mspaint_new/mspaint.exe.manifest rename to reactos/base/applications/mspaint/mspaint.exe.manifest diff --git a/reactos/base/applications/mspaint_new/palette.cpp b/reactos/base/applications/mspaint/palette.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/palette.cpp rename to reactos/base/applications/mspaint/palette.cpp diff --git a/reactos/base/applications/mspaint_new/palette.h b/reactos/base/applications/mspaint/palette.h similarity index 100% rename from reactos/base/applications/mspaint_new/palette.h rename to reactos/base/applications/mspaint/palette.h diff --git a/reactos/base/applications/mspaint_new/palettemodel.cpp b/reactos/base/applications/mspaint/palettemodel.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/palettemodel.cpp rename to reactos/base/applications/mspaint/palettemodel.cpp diff --git a/reactos/base/applications/mspaint_new/palettemodel.h b/reactos/base/applications/mspaint/palettemodel.h similarity index 100% rename from reactos/base/applications/mspaint_new/palettemodel.h rename to reactos/base/applications/mspaint/palettemodel.h diff --git a/reactos/base/applications/mspaint_new/precomp.h b/reactos/base/applications/mspaint/precomp.h similarity index 100% rename from reactos/base/applications/mspaint_new/precomp.h rename to reactos/base/applications/mspaint/precomp.h diff --git a/reactos/base/applications/mspaint_new/registry.cpp b/reactos/base/applications/mspaint/registry.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/registry.cpp rename to reactos/base/applications/mspaint/registry.cpp diff --git a/reactos/base/applications/mspaint_new/registry.h b/reactos/base/applications/mspaint/registry.h similarity index 100% rename from reactos/base/applications/mspaint_new/registry.h rename to reactos/base/applications/mspaint/registry.h diff --git a/reactos/base/applications/mspaint_new/rsrc.rc b/reactos/base/applications/mspaint/rsrc.rc similarity index 100% rename from reactos/base/applications/mspaint_new/rsrc.rc rename to reactos/base/applications/mspaint/rsrc.rc diff --git a/reactos/base/applications/mspaint_new/scrollbox.cpp b/reactos/base/applications/mspaint/scrollbox.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/scrollbox.cpp rename to reactos/base/applications/mspaint/scrollbox.cpp diff --git a/reactos/base/applications/mspaint_new/scrollbox.h b/reactos/base/applications/mspaint/scrollbox.h similarity index 100% rename from reactos/base/applications/mspaint_new/scrollbox.h rename to reactos/base/applications/mspaint/scrollbox.h diff --git a/reactos/base/applications/mspaint_new/selection.cpp b/reactos/base/applications/mspaint/selection.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/selection.cpp rename to reactos/base/applications/mspaint/selection.cpp diff --git a/reactos/base/applications/mspaint_new/selection.h b/reactos/base/applications/mspaint/selection.h similarity index 100% rename from reactos/base/applications/mspaint_new/selection.h rename to reactos/base/applications/mspaint/selection.h diff --git a/reactos/base/applications/mspaint_new/selectionmodel.cpp b/reactos/base/applications/mspaint/selectionmodel.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/selectionmodel.cpp rename to reactos/base/applications/mspaint/selectionmodel.cpp diff --git a/reactos/base/applications/mspaint_new/selectionmodel.h b/reactos/base/applications/mspaint/selectionmodel.h similarity index 100% rename from reactos/base/applications/mspaint_new/selectionmodel.h rename to reactos/base/applications/mspaint/selectionmodel.h diff --git a/reactos/base/applications/mspaint_new/sizebox.cpp b/reactos/base/applications/mspaint/sizebox.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/sizebox.cpp rename to reactos/base/applications/mspaint/sizebox.cpp diff --git a/reactos/base/applications/mspaint_new/sizebox.h b/reactos/base/applications/mspaint/sizebox.h similarity index 100% rename from reactos/base/applications/mspaint_new/sizebox.h rename to reactos/base/applications/mspaint/sizebox.h diff --git a/reactos/base/applications/mspaint_new/textedit.cpp b/reactos/base/applications/mspaint/textedit.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/textedit.cpp rename to reactos/base/applications/mspaint/textedit.cpp diff --git a/reactos/base/applications/mspaint_new/textedit.h b/reactos/base/applications/mspaint/textedit.h similarity index 100% rename from reactos/base/applications/mspaint_new/textedit.h rename to reactos/base/applications/mspaint/textedit.h diff --git a/reactos/base/applications/mspaint_new/toolbox.cpp b/reactos/base/applications/mspaint/toolbox.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/toolbox.cpp rename to reactos/base/applications/mspaint/toolbox.cpp diff --git a/reactos/base/applications/mspaint_new/toolbox.h b/reactos/base/applications/mspaint/toolbox.h similarity index 100% rename from reactos/base/applications/mspaint_new/toolbox.h rename to reactos/base/applications/mspaint/toolbox.h diff --git a/reactos/base/applications/mspaint_new/toolsettings.cpp b/reactos/base/applications/mspaint/toolsettings.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/toolsettings.cpp rename to reactos/base/applications/mspaint/toolsettings.cpp diff --git a/reactos/base/applications/mspaint_new/toolsettings.h b/reactos/base/applications/mspaint/toolsettings.h similarity index 100% rename from reactos/base/applications/mspaint_new/toolsettings.h rename to reactos/base/applications/mspaint/toolsettings.h diff --git a/reactos/base/applications/mspaint_new/toolsmodel.cpp b/reactos/base/applications/mspaint/toolsmodel.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/toolsmodel.cpp rename to reactos/base/applications/mspaint/toolsmodel.cpp diff --git a/reactos/base/applications/mspaint_new/toolsmodel.h b/reactos/base/applications/mspaint/toolsmodel.h similarity index 100% rename from reactos/base/applications/mspaint_new/toolsmodel.h rename to reactos/base/applications/mspaint/toolsmodel.h diff --git a/reactos/base/applications/mspaint_new/winproc.cpp b/reactos/base/applications/mspaint/winproc.cpp similarity index 100% rename from reactos/base/applications/mspaint_new/winproc.cpp rename to reactos/base/applications/mspaint/winproc.cpp diff --git a/reactos/base/applications/mspaint_new/winproc.h b/reactos/base/applications/mspaint/winproc.h similarity index 100% rename from reactos/base/applications/mspaint_new/winproc.h rename to reactos/base/applications/mspaint/winproc.h