diff --git a/reactos/base/applications/screensavers/screensavers.rbuild b/reactos/base/applications/screensavers/screensavers.rbuild
index 0d7ab70c305..ed3d070a2a3 100644
--- a/reactos/base/applications/screensavers/screensavers.rbuild
+++ b/reactos/base/applications/screensavers/screensavers.rbuild
@@ -4,19 +4,7 @@
 	<directory name="3dtext">
 		<xi:include href="3dtext/3dtext.rbuild" />
 	</directory>
-	<directory name="cylfrac">
-		<xi:include href="cylfrac/cylfrac.rbuild" />
-	</directory>
 	<directory name="logon">
 		<xi:include href="logon/logon.rbuild" />
 	</directory>
-	<directory name="matrix">
-		<xi:include href="matrix/matrix.rbuild" />
-	</directory>
-	<directory name="scrnsave">
-		<xi:include href="scrnsave/scrnsave.rbuild" />
-	</directory>
-	<directory name="starfield">
-		<xi:include href="starfield/starfield.rbuild" />
-	</directory>
-</group>
\ No newline at end of file
+</group>
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 5749e6ec85c..becc2959a31 100644
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -60,11 +60,8 @@ base\applications\notepad\notepad.exe                   1
 base\applications\regedit\regedit.exe                   4
 base\applications\regedit\clb\clb.dll                   1
 base\applications\sc\sc.exe                             1
-base\applications\screensavers\cylfrac\cylfrac.scr      1
+base\applications\screensavers\3dtext\3dtext.scr        1
 base\applications\screensavers\logon\logon.scr          1
-base\applications\screensavers\matrix\matrix.scr        1
-base\applications\screensavers\scrnsave\scrnsave.scr    1
-base\applications\screensavers\starfield\starfield.scr  1
 base\applications\mscutils\servman\servman.exe          1
 base\applications\shutdown\shutdown.exe                 1
 base\applications\sndvol32\sndvol32.exe                 1
@@ -445,96 +442,100 @@ boot\bootdata\bootcdregtest\testboot.bat            7   optional
 tools\dbgprint\dbgprint.exe                         7   optional
 
 ; Modules
-modules\os2\server\os2srv.dll                       1   optional
-modules\os2\dll\win32\doscalls\doscalls.dll         1   optional
-modules\posix\server\psxsrv.dll                     1   optional
-modules\posix\dll\win32\psxdll\psxdll.dll           1   optional
-modules\rosky\dll\win32\libsky\libsky.dll           1   optional
-modules\rosky\dll\win32\libskygi\libskygi.dll       1   optional
-modules\vms\server\vmssrv.dll                       1   optional
-modules\vms\dll\win32\vmsdll\vmsdll.dll             1   optional
-modules\rosapps\avtest\avtest.sys                   1   optional
-modules\rosapps\cmdutils\comp\comp.exe              1   optional
-modules\rosapps\cmdutils\mode\mode.exe              1   optional
-modules\rosapps\cmdutils\sort\sort.exe              1   optional
-modules\rosapps\cmdutils\tee\tee.exe                1   optional
-modules\rosapps\cmdutils\touch\touch.exe            1   optional
-modules\rosapps\cmdutils\uptime\uptime.exe          1   optional
-modules\rosapps\cmdutils\y\y.exe                    1   optional
-modules\rosapps\demos\ddraw\ddraw_demo.exe          1   optional
-modules\rosapps\demos\maze\maze.exe                 1   optional
-modules\rosapps\devutils\cputointel\cputointel.exe  1   optional
-modules\rosapps\devutils\gdb2\gdb2.exe              1   optional
-modules\rosapps\devutils\gdihv\gdihv.exe            1   optional
-modules\rosapps\devutils\genguid\genguid.exe        1   optional
-modules\rosapps\devutils\roswebparser\roswebparser.exe   1   optional
-modules\rosapps\devutils\zoomin\zoomin.exe          1   optional
-modules\rosapps\dflat32\edit.exe                    1   optional
-modules\rosapps\downloader\downloader.exe           1   optional
-modules\rosapps\downloader\downloader.xml           1   optional
-modules\rosapps\gettype\gettype.exe                 1   optional
-modules\rosapps\green\green.sys                     1   optional
-modules\rosapps\imagesoft\imagesoft.exe             1   optional
-modules\rosapps\lib\dflat32\dflat32.dll             1   optional
-modules\rosapps\mc\mc.exe                           1   optional
-modules\rosapps\net\ncftp\ncftp.exe                 1   optional
-modules\rosapps\net\netreg\netreg.exe               1   optional
-modules\rosapps\net\niclist\niclist.exe             1   optional
-modules\rosapps\notevil\notevil.exe                 1   optional
-modules\rosapps\magnify\magnify.exe                 1   optional
-modules\rosapps\packmgr\cmd-line\rosget.exe         1   optional
-modules\rosapps\packmgr\gui\packmgr.exe             1   optional
-modules\rosapps\packmgr\lib\package.dll             1   optional
-modules\rosapps\ramdrv\ramdrv.sys                   1   optional
-modules\rosapps\roshttpd\roshttpd.exe               1   optional
-modules\rosapps\screenshot\screenshot.exe           1   optional
-modules\rosapps\sysutils\chkdsk\chkdsk.exe          1   optional
-modules\rosapps\sysutils\systeminfo\systeminfo.exe  1   optional
-modules\rosapps\sysutils\chklib\chklib.exe          1   optional
-modules\rosapps\sysutils\ctm\ctm.exe                1   optional
-modules\rosapps\sysutils\kill\kill.exe              1   optional
-modules\rosapps\sysutils\lsdd\lsdd.exe              1   optional
-modules\rosapps\sysutils\man\man.exe                1   optional
-modules\rosapps\sysutils\pedump\pedump.exe          1   optional
-modules\rosapps\sysutils\regexpl\regexpl.exe        1   optional
-modules\rosapps\sysutils\tcat\tcat.exe              1   optional
-modules\rosapps\sysutils\tlist\tlist.exe            1   optional
-modules\rosapps\sysutils\utils\binpatch\binpatch.exe       1   optional
-modules\rosapps\sysutils\utils\cat\cat.exe                 1   optional
-modules\rosapps\sysutils\utils\driver\load\load.exe        1   optional
-modules\rosapps\sysutils\utils\driver\unload\unload.exe    1   optional
-modules\rosapps\sysutils\utils\infinst\infinst.exe         1   optional
-modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe   1   optional
-modules\rosapps\sysutils\utils\objdir\objdir.exe           1   optional
-modules\rosapps\sysutils\utils\partinfo\partinfo.exe       1   optional
-modules\rosapps\sysutils\utils\ps\ps.exe                   1   optional
-modules\rosapps\sysutils\utils\rosperf\rosperf.exe         1   optional
-modules\rosapps\sysutils\utils\stats\stats.exe             1   optional
-modules\rosapps\sysutils\utils\tickcount\tickcount.exe     1   optional
-modules\rosapps\templates\dialog.exe                1   optional
-modules\rosapps\templates\mdi.exe                   1   optional
-modules\rosapps\winefile\winefile.exe               1   optional
-modules\rosapps\winver\winver.exe                   1   optional
-modules\rosapps\write\write.exe                     1   optional
-modules\rostests\winetests\advapi32\advapi32_winetest.exe   7   optional
-modules\rostests\winetests\cabinet\cabinet_winetest.exe     7   optional
-modules\rostests\winetests\comctl32\comctl32_winetest.exe   7   optional
-modules\rostests\winetests\gdi32\gdi32_winetest.exe         7   optional
-modules\rostests\winetests\icmp\icmp_winetest.exe           7   optional
-modules\rostests\winetests\kernel32\kernel32_winetest.exe   7   optional
-modules\rostests\winetests\lz32\lz32_winetest.exe           7   optional
-modules\rostests\winetests\msi\msi_winetest.exe             7   optional
-modules\rostests\winetests\msvcrt\msvcrt_winetest.exe       7   optional
-modules\rostests\winetests\ntdll\ntdll_winetest.exe         7   optional
-modules\rostests\winetests\powrprof\powrprof_winetest.exe   7   optional
-modules\rostests\winetests\psapi\psapi_winetest.exe         7   optional
-modules\rostests\winetests\setupapi\setupapi_winetest.exe   7   optional
-modules\rostests\winetests\shell32\shell32_winetest.exe     7   optional
-modules\rostests\winetests\shlwapi\shlwapi_winetest.exe     7   optional
-modules\rostests\winetests\user32\user32_winetest.exe       7   optional
-modules\rostests\winetests\usp10\usp10_winetest.exe         7   optional
-modules\rostests\winetests\version\version_winetest.exe     7   optional
-modules\wallpaper\lake.bmp                                  4   optional
+modules\os2\server\os2srv.dll                                       1   optional
+modules\os2\dll\win32\doscalls\doscalls.dll                         1   optional
+modules\posix\server\psxsrv.dll                                     1   optional
+modules\posix\dll\win32\psxdll\psxdll.dll                           1   optional
+modules\rosky\dll\win32\libsky\libsky.dll                           1   optional
+modules\rosky\dll\win32\libskygi\libskygi.dll                       1   optional
+modules\vms\server\vmssrv.dll                                       1   optional
+modules\vms\dll\win32\vmsdll\vmsdll.dll                             1   optional
+modules\rosapps\avtest\avtest.sys                                   1   optional
+modules\rosapps\applications\screensavers\cylfrac\cylfrac.scr       1   optional
+modules\rosapps\applications\screensavers\matrix\matrix.scr         1   optional
+modules\rosapps\applications\screensavers\scrnsave\scrnsave.scr     1   optional
+modules\rosapps\applications\screensavers\starfield\starfield.scr   1   optional
+modules\rosapps\cmdutils\comp\comp.exe                              1   optional
+modules\rosapps\cmdutils\mode\mode.exe                              1   optional
+modules\rosapps\cmdutils\sort\sort.exe                              1   optional
+modules\rosapps\cmdutils\tee\tee.exe                                1   optional
+modules\rosapps\cmdutils\touch\touch.exe                            1   optional
+modules\rosapps\cmdutils\uptime\uptime.exe                          1   optional
+modules\rosapps\cmdutils\y\y.exe                                    1   optional
+modules\rosapps\demos\ddraw\ddraw_demo.exe                          1   optional
+modules\rosapps\demos\maze\maze.exe                                 1   optional
+modules\rosapps\devutils\cputointel\cputointel.exe                  1   optional
+modules\rosapps\devutils\gdb2\gdb2.exe                              1   optional
+modules\rosapps\devutils\gdihv\gdihv.exe                            1   optional
+modules\rosapps\devutils\genguid\genguid.exe                        1   optional
+modules\rosapps\devutils\roswebparser\roswebparser.exe              1   optional
+modules\rosapps\devutils\zoomin\zoomin.exe                          1   optional
+modules\rosapps\dflat32\edit.exe                                    1   optional
+modules\rosapps\downloader\downloader.exe                           1   optional
+modules\rosapps\downloader\downloader.xml                           1   optional
+modules\rosapps\gettype\gettype.exe                                 1   optional
+modules\rosapps\green\green.sys                                     1   optional
+modules\rosapps\imagesoft\imagesoft.exe                             1   optional
+modules\rosapps\lib\dflat32\dflat32.dll                             1   optional
+modules\rosapps\mc\mc.exe                                           1   optional
+modules\rosapps\net\ncftp\ncftp.exe                                 1   optional
+modules\rosapps\net\netreg\netreg.exe                               1   optional
+modules\rosapps\net\niclist\niclist.exe                             1   optional
+modules\rosapps\notevil\notevil.exe                                 1   optional
+modules\rosapps\magnify\magnify.exe                                 1   optional
+modules\rosapps\packmgr\cmd-line\rosget.exe                         1   optional
+modules\rosapps\packmgr\gui\packmgr.exe                             1   optional
+modules\rosapps\packmgr\lib\package.dll                             1   optional
+modules\rosapps\ramdrv\ramdrv.sys                                   1   optional
+modules\rosapps\roshttpd\roshttpd.exe                               1   optional
+modules\rosapps\screenshot\screenshot.exe                           1   optional
+modules\rosapps\sysutils\chkdsk\chkdsk.exe                          1   optional
+modules\rosapps\sysutils\systeminfo\systeminfo.exe                  1   optional
+modules\rosapps\sysutils\chklib\chklib.exe                          1   optional
+modules\rosapps\sysutils\ctm\ctm.exe                                1   optional
+modules\rosapps\sysutils\kill\kill.exe                              1   optional
+modules\rosapps\sysutils\lsdd\lsdd.exe                              1   optional
+modules\rosapps\sysutils\man\man.exe                                1   optional
+modules\rosapps\sysutils\pedump\pedump.exe                          1   optional
+modules\rosapps\sysutils\regexpl\regexpl.exe                        1   optional
+modules\rosapps\sysutils\tcat\tcat.exe                              1   optional
+modules\rosapps\sysutils\tlist\tlist.exe                            1   optional
+modules\rosapps\sysutils\utils\binpatch\binpatch.exe                1   optional
+modules\rosapps\sysutils\utils\cat\cat.exe                          1   optional
+modules\rosapps\sysutils\utils\driver\load\load.exe                 1   optional
+modules\rosapps\sysutils\utils\driver\unload\unload.exe             1   optional
+modules\rosapps\sysutils\utils\infinst\infinst.exe                  1   optional
+modules\rosapps\sysutils\utils\nts2w32err\nts2w32err.exe            1   optional
+modules\rosapps\sysutils\utils\objdir\objdir.exe                    1   optional
+modules\rosapps\sysutils\utils\partinfo\partinfo.exe                1   optional
+modules\rosapps\sysutils\utils\ps\ps.exe                            1   optional
+modules\rosapps\sysutils\utils\rosperf\rosperf.exe                  1   optional
+modules\rosapps\sysutils\utils\stats\stats.exe                      1   optional
+modules\rosapps\sysutils\utils\tickcount\tickcount.exe              1   optional
+modules\rosapps\templates\dialog.exe                                1   optional
+modules\rosapps\templates\mdi.exe                                   1   optional
+modules\rosapps\winefile\winefile.exe                               1   optional
+modules\rosapps\winver\winver.exe                                   1   optional
+modules\rosapps\write\write.exe                                     1   optional
+modules\rostests\winetests\advapi32\advapi32_winetest.exe           7   optional
+modules\rostests\winetests\cabinet\cabinet_winetest.exe             7   optional
+modules\rostests\winetests\comctl32\comctl32_winetest.exe           7   optional
+modules\rostests\winetests\gdi32\gdi32_winetest.exe                 7   optional
+modules\rostests\winetests\icmp\icmp_winetest.exe                   7   optional
+modules\rostests\winetests\kernel32\kernel32_winetest.exe           7   optional
+modules\rostests\winetests\lz32\lz32_winetest.exe                   7   optional
+modules\rostests\winetests\msi\msi_winetest.exe                     7   optional
+modules\rostests\winetests\msvcrt\msvcrt_winetest.exe               7   optional
+modules\rostests\winetests\ntdll\ntdll_winetest.exe                 7   optional
+modules\rostests\winetests\powrprof\powrprof_winetest.exe           7   optional
+modules\rostests\winetests\psapi\psapi_winetest.exe                 7   optional
+modules\rostests\winetests\setupapi\setupapi_winetest.exe           7   optional
+modules\rostests\winetests\shell32\shell32_winetest.exe             7   optional
+modules\rostests\winetests\shlwapi\shlwapi_winetest.exe             7   optional
+modules\rostests\winetests\user32\user32_winetest.exe               7   optional
+modules\rostests\winetests\usp10\usp10_winetest.exe                 7   optional
+modules\rostests\winetests\version\version_winetest.exe             7   optional
+modules\wallpaper\lake.bmp                                          4   optional
 
 ; Native libraries
-modules\windows\mfc42.dll                                   1   optional
\ No newline at end of file
+modules\windows\mfc42.dll                                           1   optional
\ No newline at end of file
diff --git a/rosapps/applications/applications.rbuild b/rosapps/applications/applications.rbuild
new file mode 100644
index 00000000000..41597a4be9c
--- /dev/null
+++ b/rosapps/applications/applications.rbuild
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="screensavers">
+		<xi:include href="screensavers/screensavers.rbuild" />
+	</directory>
+</group>
diff --git a/reactos/base/applications/screensavers/cylfrac/cylfrac.c b/rosapps/applications/screensavers/cylfrac/cylfrac.c
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/cylfrac.c
rename to rosapps/applications/screensavers/cylfrac/cylfrac.c
diff --git a/reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild b/rosapps/applications/screensavers/cylfrac/cylfrac.rbuild
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/cylfrac.rbuild
rename to rosapps/applications/screensavers/cylfrac/cylfrac.rbuild
diff --git a/reactos/base/applications/screensavers/cylfrac/cylfrac.rc b/rosapps/applications/screensavers/cylfrac/cylfrac.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/cylfrac.rc
rename to rosapps/applications/screensavers/cylfrac/cylfrac.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/de-DE.rc b/rosapps/applications/screensavers/cylfrac/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/de-DE.rc
rename to rosapps/applications/screensavers/cylfrac/lang/de-DE.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/en-US.rc b/rosapps/applications/screensavers/cylfrac/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/en-US.rc
rename to rosapps/applications/screensavers/cylfrac/lang/en-US.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/fr-FR.rc b/rosapps/applications/screensavers/cylfrac/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/fr-FR.rc
rename to rosapps/applications/screensavers/cylfrac/lang/fr-FR.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/lt-LT.rc b/rosapps/applications/screensavers/cylfrac/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/lt-LT.rc
rename to rosapps/applications/screensavers/cylfrac/lang/lt-LT.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/nl-NL.rc b/rosapps/applications/screensavers/cylfrac/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/nl-NL.rc
rename to rosapps/applications/screensavers/cylfrac/lang/nl-NL.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/sk-SK.rc b/rosapps/applications/screensavers/cylfrac/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/sk-SK.rc
rename to rosapps/applications/screensavers/cylfrac/lang/sk-SK.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/lang/uk-UA.rc b/rosapps/applications/screensavers/cylfrac/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/lang/uk-UA.rc
rename to rosapps/applications/screensavers/cylfrac/lang/uk-UA.rc
diff --git a/reactos/base/applications/screensavers/cylfrac/resource.h b/rosapps/applications/screensavers/cylfrac/resource.h
similarity index 100%
rename from reactos/base/applications/screensavers/cylfrac/resource.h
rename to rosapps/applications/screensavers/cylfrac/resource.h
diff --git a/reactos/base/applications/screensavers/matrix/Permission.txt b/rosapps/applications/screensavers/matrix/Permission.txt
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/Permission.txt
rename to rosapps/applications/screensavers/matrix/Permission.txt
diff --git a/reactos/base/applications/screensavers/matrix/ReadMe.txt b/rosapps/applications/screensavers/matrix/ReadMe.txt
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/ReadMe.txt
rename to rosapps/applications/screensavers/matrix/ReadMe.txt
diff --git a/reactos/base/applications/screensavers/matrix/config.c b/rosapps/applications/screensavers/matrix/config.c
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/config.c
rename to rosapps/applications/screensavers/matrix/config.c
diff --git a/reactos/base/applications/screensavers/matrix/cursor1.cur b/rosapps/applications/screensavers/matrix/cursor1.cur
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/cursor1.cur
rename to rosapps/applications/screensavers/matrix/cursor1.cur
diff --git a/reactos/base/applications/screensavers/matrix/globals.h b/rosapps/applications/screensavers/matrix/globals.h
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/globals.h
rename to rosapps/applications/screensavers/matrix/globals.h
diff --git a/reactos/base/applications/screensavers/matrix/icon1.ico b/rosapps/applications/screensavers/matrix/icon1.ico
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/icon1.ico
rename to rosapps/applications/screensavers/matrix/icon1.ico
diff --git a/reactos/base/applications/screensavers/matrix/lang/bg-BG.rc b/rosapps/applications/screensavers/matrix/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/bg-BG.rc
rename to rosapps/applications/screensavers/matrix/lang/bg-BG.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/de-DE.rc b/rosapps/applications/screensavers/matrix/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/de-DE.rc
rename to rosapps/applications/screensavers/matrix/lang/de-DE.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/en-US.rc b/rosapps/applications/screensavers/matrix/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/en-US.rc
rename to rosapps/applications/screensavers/matrix/lang/en-US.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/fr-FR.rc b/rosapps/applications/screensavers/matrix/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/fr-FR.rc
rename to rosapps/applications/screensavers/matrix/lang/fr-FR.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/lt-LT.rc b/rosapps/applications/screensavers/matrix/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/lt-LT.rc
rename to rosapps/applications/screensavers/matrix/lang/lt-LT.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/nl-NL.rc b/rosapps/applications/screensavers/matrix/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/nl-NL.rc
rename to rosapps/applications/screensavers/matrix/lang/nl-NL.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/sk-SK.rc b/rosapps/applications/screensavers/matrix/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/sk-SK.rc
rename to rosapps/applications/screensavers/matrix/lang/sk-SK.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/th-TH.rc b/rosapps/applications/screensavers/matrix/lang/th-TH.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/th-TH.rc
rename to rosapps/applications/screensavers/matrix/lang/th-TH.rc
diff --git a/reactos/base/applications/screensavers/matrix/lang/uk-UA.rc b/rosapps/applications/screensavers/matrix/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/lang/uk-UA.rc
rename to rosapps/applications/screensavers/matrix/lang/uk-UA.rc
diff --git a/reactos/base/applications/screensavers/matrix/matrix.bmp b/rosapps/applications/screensavers/matrix/matrix.bmp
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/matrix.bmp
rename to rosapps/applications/screensavers/matrix/matrix.bmp
diff --git a/reactos/base/applications/screensavers/matrix/matrix.c b/rosapps/applications/screensavers/matrix/matrix.c
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/matrix.c
rename to rosapps/applications/screensavers/matrix/matrix.c
diff --git a/reactos/base/applications/screensavers/matrix/matrix.dsp b/rosapps/applications/screensavers/matrix/matrix.dsp
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/matrix.dsp
rename to rosapps/applications/screensavers/matrix/matrix.dsp
diff --git a/reactos/base/applications/screensavers/matrix/matrix.h b/rosapps/applications/screensavers/matrix/matrix.h
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/matrix.h
rename to rosapps/applications/screensavers/matrix/matrix.h
diff --git a/reactos/base/applications/screensavers/matrix/matrix.rbuild b/rosapps/applications/screensavers/matrix/matrix.rbuild
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/matrix.rbuild
rename to rosapps/applications/screensavers/matrix/matrix.rbuild
diff --git a/reactos/base/applications/screensavers/matrix/message.c b/rosapps/applications/screensavers/matrix/message.c
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/message.c
rename to rosapps/applications/screensavers/matrix/message.c
diff --git a/reactos/base/applications/screensavers/matrix/message.h b/rosapps/applications/screensavers/matrix/message.h
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/message.h
rename to rosapps/applications/screensavers/matrix/message.h
diff --git a/reactos/base/applications/screensavers/matrix/password.c b/rosapps/applications/screensavers/matrix/password.c
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/password.c
rename to rosapps/applications/screensavers/matrix/password.c
diff --git a/reactos/base/applications/screensavers/matrix/resource.h b/rosapps/applications/screensavers/matrix/resource.h
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/resource.h
rename to rosapps/applications/screensavers/matrix/resource.h
diff --git a/reactos/base/applications/screensavers/matrix/rsrc.rc b/rosapps/applications/screensavers/matrix/rsrc.rc
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/rsrc.rc
rename to rosapps/applications/screensavers/matrix/rsrc.rc
diff --git a/reactos/base/applications/screensavers/matrix/screensave.c b/rosapps/applications/screensavers/matrix/screensave.c
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/screensave.c
rename to rosapps/applications/screensavers/matrix/screensave.c
diff --git a/reactos/base/applications/screensavers/matrix/settings.c b/rosapps/applications/screensavers/matrix/settings.c
similarity index 100%
rename from reactos/base/applications/screensavers/matrix/settings.c
rename to rosapps/applications/screensavers/matrix/settings.c
diff --git a/rosapps/applications/screensavers/screensavers.rbuild b/rosapps/applications/screensavers/screensavers.rbuild
new file mode 100644
index 00000000000..b65a19452af
--- /dev/null
+++ b/rosapps/applications/screensavers/screensavers.rbuild
@@ -0,0 +1,16 @@
+<?xml version="1.0"?>
+<!DOCTYPE group SYSTEM "../../../tools/rbuild/project.dtd">
+<group xmlns:xi="http://www.w3.org/2001/XInclude">
+	<directory name="cylfrac">
+		<xi:include href="cylfrac/cylfrac.rbuild" />
+	</directory>
+	<directory name="matrix">
+		<xi:include href="matrix/matrix.rbuild" />
+	</directory>
+	<directory name="scrnsave">
+		<xi:include href="scrnsave/scrnsave.rbuild" />
+	</directory>
+	<directory name="starfield">
+		<xi:include href="starfield/starfield.rbuild" />
+	</directory>
+</group>
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/de-DE.rc b/rosapps/applications/screensavers/scrnsave/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/de-DE.rc
rename to rosapps/applications/screensavers/scrnsave/lang/de-DE.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/en-US.rc b/rosapps/applications/screensavers/scrnsave/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/en-US.rc
rename to rosapps/applications/screensavers/scrnsave/lang/en-US.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/fr-FR.rc b/rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/fr-FR.rc
rename to rosapps/applications/screensavers/scrnsave/lang/fr-FR.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/lt-LT.rc b/rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/lt-LT.rc
rename to rosapps/applications/screensavers/scrnsave/lang/lt-LT.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/nl-NL.rc b/rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/nl-NL.rc
rename to rosapps/applications/screensavers/scrnsave/lang/nl-NL.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc b/rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/sk-SK.rc
rename to rosapps/applications/screensavers/scrnsave/lang/sk-SK.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/lang/uk-UA.rc b/rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/lang/uk-UA.rc
rename to rosapps/applications/screensavers/scrnsave/lang/uk-UA.rc
diff --git a/reactos/base/applications/screensavers/scrnsave/resource.h b/rosapps/applications/screensavers/scrnsave/resource.h
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/resource.h
rename to rosapps/applications/screensavers/scrnsave/resource.h
diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.c b/rosapps/applications/screensavers/scrnsave/scrnsave.c
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/scrnsave.c
rename to rosapps/applications/screensavers/scrnsave/scrnsave.c
diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild b/rosapps/applications/screensavers/scrnsave/scrnsave.rbuild
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/scrnsave.rbuild
rename to rosapps/applications/screensavers/scrnsave/scrnsave.rbuild
diff --git a/reactos/base/applications/screensavers/scrnsave/scrnsave.rc b/rosapps/applications/screensavers/scrnsave/scrnsave.rc
similarity index 100%
rename from reactos/base/applications/screensavers/scrnsave/scrnsave.rc
rename to rosapps/applications/screensavers/scrnsave/scrnsave.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/de-DE.rc b/rosapps/applications/screensavers/starfield/lang/de-DE.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/de-DE.rc
rename to rosapps/applications/screensavers/starfield/lang/de-DE.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/en-US.rc b/rosapps/applications/screensavers/starfield/lang/en-US.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/en-US.rc
rename to rosapps/applications/screensavers/starfield/lang/en-US.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/fr-FR.rc b/rosapps/applications/screensavers/starfield/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/fr-FR.rc
rename to rosapps/applications/screensavers/starfield/lang/fr-FR.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/lt-LT.rc b/rosapps/applications/screensavers/starfield/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/lt-LT.rc
rename to rosapps/applications/screensavers/starfield/lang/lt-LT.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/nl-NL.rc b/rosapps/applications/screensavers/starfield/lang/nl-NL.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/nl-NL.rc
rename to rosapps/applications/screensavers/starfield/lang/nl-NL.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/sk-SK.rc b/rosapps/applications/screensavers/starfield/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/sk-SK.rc
rename to rosapps/applications/screensavers/starfield/lang/sk-SK.rc
diff --git a/reactos/base/applications/screensavers/starfield/lang/uk-UA.rc b/rosapps/applications/screensavers/starfield/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/lang/uk-UA.rc
rename to rosapps/applications/screensavers/starfield/lang/uk-UA.rc
diff --git a/reactos/base/applications/screensavers/starfield/resource.h b/rosapps/applications/screensavers/starfield/resource.h
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/resource.h
rename to rosapps/applications/screensavers/starfield/resource.h
diff --git a/reactos/base/applications/screensavers/starfield/screensaver.c b/rosapps/applications/screensavers/starfield/screensaver.c
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/screensaver.c
rename to rosapps/applications/screensavers/starfield/screensaver.c
diff --git a/reactos/base/applications/screensavers/starfield/starfield.rbuild b/rosapps/applications/screensavers/starfield/starfield.rbuild
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/starfield.rbuild
rename to rosapps/applications/screensavers/starfield/starfield.rbuild
diff --git a/reactos/base/applications/screensavers/starfield/starfield.rc b/rosapps/applications/screensavers/starfield/starfield.rc
similarity index 100%
rename from reactos/base/applications/screensavers/starfield/starfield.rc
rename to rosapps/applications/screensavers/starfield/starfield.rc
diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index 4cc06fa43a8..60fbef2f792 100644
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -7,6 +7,10 @@
 	</directory>
 	-->
 
+	<directory name="applications">
+		<xi:include href="applications/applications.rbuild" />
+	</directory>
+	
 	<directory name="cmdutils">
 		<xi:include href="cmdutils/cmdutils.rbuild" />
 	</directory>
@@ -120,4 +124,4 @@
 	<directory name="write">
 		<xi:include href="write/write.rbuild" />
 	</directory>
-</group>
\ No newline at end of file
+</group>