diff --git a/reactos/subsys/system/notepad/ChangeLog b/reactos/base/applications/notepad/ChangeLog
similarity index 100%
rename from reactos/subsys/system/notepad/ChangeLog
rename to reactos/base/applications/notepad/ChangeLog
diff --git a/reactos/subsys/system/notepad/Makefile.in b/reactos/base/applications/notepad/Makefile.in
similarity index 100%
rename from reactos/subsys/system/notepad/Makefile.in
rename to reactos/base/applications/notepad/Makefile.in
diff --git a/reactos/subsys/system/notepad/dialog.c b/reactos/base/applications/notepad/dialog.c
similarity index 100%
rename from reactos/subsys/system/notepad/dialog.c
rename to reactos/base/applications/notepad/dialog.c
diff --git a/reactos/subsys/system/notepad/dialog.h b/reactos/base/applications/notepad/dialog.h
similarity index 100%
rename from reactos/subsys/system/notepad/dialog.h
rename to reactos/base/applications/notepad/dialog.h
diff --git a/reactos/subsys/system/notepad/license.c b/reactos/base/applications/notepad/license.c
similarity index 100%
rename from reactos/subsys/system/notepad/license.c
rename to reactos/base/applications/notepad/license.c
diff --git a/reactos/subsys/system/notepad/main.c b/reactos/base/applications/notepad/main.c
similarity index 100%
rename from reactos/subsys/system/notepad/main.c
rename to reactos/base/applications/notepad/main.c
diff --git a/reactos/subsys/system/notepad/main.h b/reactos/base/applications/notepad/main.h
similarity index 100%
rename from reactos/subsys/system/notepad/main.h
rename to reactos/base/applications/notepad/main.h
diff --git a/reactos/subsys/system/notepad/notepad.h b/reactos/base/applications/notepad/notepad.h
similarity index 100%
rename from reactos/subsys/system/notepad/notepad.h
rename to reactos/base/applications/notepad/notepad.h
diff --git a/reactos/subsys/system/notepad/notepad.rc b/reactos/base/applications/notepad/notepad.rc
similarity index 100%
rename from reactos/subsys/system/notepad/notepad.rc
rename to reactos/base/applications/notepad/notepad.rc
diff --git a/reactos/subsys/system/notepad/notepad.xml b/reactos/base/applications/notepad/notepad.xml
similarity index 100%
rename from reactos/subsys/system/notepad/notepad.xml
rename to reactos/base/applications/notepad/notepad.xml
diff --git a/reactos/subsys/system/notepad/notepad_res.h b/reactos/base/applications/notepad/notepad_res.h
similarity index 100%
rename from reactos/subsys/system/notepad/notepad_res.h
rename to reactos/base/applications/notepad/notepad_res.h
diff --git a/reactos/subsys/system/notepad/res/Cs.rc b/reactos/base/applications/notepad/res/Cs.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Cs.rc
rename to reactos/base/applications/notepad/res/Cs.rc
diff --git a/reactos/subsys/system/notepad/res/Da.rc b/reactos/base/applications/notepad/res/Da.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Da.rc
rename to reactos/base/applications/notepad/res/Da.rc
diff --git a/reactos/subsys/system/notepad/res/De.rc b/reactos/base/applications/notepad/res/De.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/De.rc
rename to reactos/base/applications/notepad/res/De.rc
diff --git a/reactos/subsys/system/notepad/res/En.rc b/reactos/base/applications/notepad/res/En.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/En.rc
rename to reactos/base/applications/notepad/res/En.rc
diff --git a/reactos/subsys/system/notepad/res/Es.rc b/reactos/base/applications/notepad/res/Es.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Es.rc
rename to reactos/base/applications/notepad/res/Es.rc
diff --git a/reactos/subsys/system/notepad/res/Fi.rc b/reactos/base/applications/notepad/res/Fi.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Fi.rc
rename to reactos/base/applications/notepad/res/Fi.rc
diff --git a/reactos/subsys/system/notepad/res/Fr.rc b/reactos/base/applications/notepad/res/Fr.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Fr.rc
rename to reactos/base/applications/notepad/res/Fr.rc
diff --git a/reactos/subsys/system/notepad/res/Gr.rc b/reactos/base/applications/notepad/res/Gr.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Gr.rc
rename to reactos/base/applications/notepad/res/Gr.rc
diff --git a/reactos/subsys/system/notepad/res/Hu.rc b/reactos/base/applications/notepad/res/Hu.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Hu.rc
rename to reactos/base/applications/notepad/res/Hu.rc
diff --git a/reactos/subsys/system/notepad/res/It.rc b/reactos/base/applications/notepad/res/It.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/It.rc
rename to reactos/base/applications/notepad/res/It.rc
diff --git a/reactos/subsys/system/notepad/res/Ja.rc b/reactos/base/applications/notepad/res/Ja.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Ja.rc
rename to reactos/base/applications/notepad/res/Ja.rc
diff --git a/reactos/subsys/system/notepad/res/Nl.rc b/reactos/base/applications/notepad/res/Nl.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Nl.rc
rename to reactos/base/applications/notepad/res/Nl.rc
diff --git a/reactos/subsys/system/notepad/res/Pl.rc b/reactos/base/applications/notepad/res/Pl.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Pl.rc
rename to reactos/base/applications/notepad/res/Pl.rc
diff --git a/reactos/subsys/system/notepad/res/Pt.rc b/reactos/base/applications/notepad/res/Pt.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Pt.rc
rename to reactos/base/applications/notepad/res/Pt.rc
diff --git a/reactos/subsys/system/notepad/res/Ru.rc b/reactos/base/applications/notepad/res/Ru.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Ru.rc
rename to reactos/base/applications/notepad/res/Ru.rc
diff --git a/reactos/subsys/system/notepad/res/Si.rc b/reactos/base/applications/notepad/res/Si.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Si.rc
rename to reactos/base/applications/notepad/res/Si.rc
diff --git a/reactos/subsys/system/notepad/res/Sk.rc b/reactos/base/applications/notepad/res/Sk.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Sk.rc
rename to reactos/base/applications/notepad/res/Sk.rc
diff --git a/reactos/subsys/system/notepad/res/Sv.rc b/reactos/base/applications/notepad/res/Sv.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Sv.rc
rename to reactos/base/applications/notepad/res/Sv.rc
diff --git a/reactos/subsys/system/notepad/res/Th.rc b/reactos/base/applications/notepad/res/Th.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Th.rc
rename to reactos/base/applications/notepad/res/Th.rc
diff --git a/reactos/subsys/system/notepad/res/Uk.rc b/reactos/base/applications/notepad/res/Uk.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Uk.rc
rename to reactos/base/applications/notepad/res/Uk.rc
diff --git a/reactos/subsys/system/notepad/res/Wa.rc b/reactos/base/applications/notepad/res/Wa.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Wa.rc
rename to reactos/base/applications/notepad/res/Wa.rc
diff --git a/reactos/subsys/system/notepad/res/Zh.rc b/reactos/base/applications/notepad/res/Zh.rc
similarity index 100%
rename from reactos/subsys/system/notepad/res/Zh.rc
rename to reactos/base/applications/notepad/res/Zh.rc
diff --git a/reactos/subsys/system/notepad/res/notepad.ico b/reactos/base/applications/notepad/res/notepad.ico
similarity index 100%
rename from reactos/subsys/system/notepad/res/notepad.ico
rename to reactos/base/applications/notepad/res/notepad.ico
diff --git a/reactos/subsys/system/notepad/rsrc.rc b/reactos/base/applications/notepad/rsrc.rc
similarity index 100%
rename from reactos/subsys/system/notepad/rsrc.rc
rename to reactos/base/applications/notepad/rsrc.rc
diff --git a/reactos/subsys/system/notepad/settings.c b/reactos/base/applications/notepad/settings.c
similarity index 100%
rename from reactos/subsys/system/notepad/settings.c
rename to reactos/base/applications/notepad/settings.c
diff --git a/reactos/subsys/system/notepad/text.c b/reactos/base/applications/notepad/text.c
similarity index 100%
rename from reactos/subsys/system/notepad/text.c
rename to reactos/base/applications/notepad/text.c