diff --git a/rosapps/applications/applications.rbuild b/rosapps/applications/applications.rbuild
index 41597a4be9c..d98a6b70cfe 100644
--- a/rosapps/applications/applications.rbuild
+++ b/rosapps/applications/applications.rbuild
@@ -4,4 +4,82 @@
 	<directory name="screensavers">
 		<xi:include href="screensavers/screensavers.rbuild" />
 	</directory>
+
+	<directory name="cmdutils">
+		<xi:include href="cmdutils/cmdutils.rbuild" />
+	</directory>
+
+	<directory name="devutils">
+		<xi:include href="devutils/directory.rbuild" />
+	</directory>
+
+	<directory name="downloader">
+		<xi:include href="downloader/downloader.rbuild" />
+	</directory>
+
+	<directory name="fontview">
+		<xi:include href="fontview/fontview.rbuild" />
+	</directory>
+<!--
+	<directory name="fraginator">
+		<xi:include href="fraginator/fraginator.rbuild" />
+	</directory>
+-->
+	<directory name="gettype">
+		<xi:include href="gettype/gettype.rbuild" />
+	</directory>
+
+	<directory name="imagesoft">
+		<xi:include href="imagesoft/imagesoft.rbuild" />
+	</directory>
+
+	<directory name="logevent">
+		<xi:include href="logevent/logevent.rbuild" />
+	</directory>
+
+	<directory name="magnify">
+		<xi:include href="magnify/magnify.rbuild" />
+	</directory>
+
+	<directory name="mc">
+		<xi:include href="mc/mc.rbuild" />
+	</directory>
+
+	<directory name="net">
+		<xi:include href="net/directory.rbuild" />
+	</directory>
+
+	<directory name="notevil">
+		<xi:include href="notevil/notevil.rbuild" />
+	</directory>
+
+	<!--
+	<directory name="packmgr">
+		<xi:include href="packmgr/directory.rbuild" />
+	</directory>
+	-->
+
+	<directory name="roshttpd">
+		<xi:include href="roshttpd/roshttpd.rbuild" />
+	</directory>
+
+	<directory name="screenshot">
+		<xi:include href="screenshot/screenshot.rbuild" />
+	</directory>
+
+	<directory name="sysutils">
+		<xi:include href="sysutils/sysutils.rbuild" />
+	</directory>
+
+	<directory name="winfile">
+		<xi:include href="winfile/winfile.rbuild" />
+	</directory>
+
+	<directory name="winver">
+		<xi:include href="winver/winver.rbuild" />
+	</directory>
+
+	<directory name="write">
+		<xi:include href="write/write.rbuild" />
+	</directory>
 </group>
diff --git a/rosapps/cmdutils/cmdutils.rbuild b/rosapps/applications/cmdutils/cmdutils.rbuild
similarity index 100%
rename from rosapps/cmdutils/cmdutils.rbuild
rename to rosapps/applications/cmdutils/cmdutils.rbuild
diff --git a/rosapps/cmdutils/comp/comp.c b/rosapps/applications/cmdutils/comp/comp.c
similarity index 100%
rename from rosapps/cmdutils/comp/comp.c
rename to rosapps/applications/cmdutils/comp/comp.c
diff --git a/rosapps/cmdutils/comp/comp.rbuild b/rosapps/applications/cmdutils/comp/comp.rbuild
similarity index 100%
rename from rosapps/cmdutils/comp/comp.rbuild
rename to rosapps/applications/cmdutils/comp/comp.rbuild
diff --git a/rosapps/cmdutils/comp/comp.rc b/rosapps/applications/cmdutils/comp/comp.rc
similarity index 100%
rename from rosapps/cmdutils/comp/comp.rc
rename to rosapps/applications/cmdutils/comp/comp.rc
diff --git a/rosapps/cmdutils/mode/mode.c b/rosapps/applications/cmdutils/mode/mode.c
similarity index 100%
rename from rosapps/cmdutils/mode/mode.c
rename to rosapps/applications/cmdutils/mode/mode.c
diff --git a/rosapps/cmdutils/mode/mode.rbuild b/rosapps/applications/cmdutils/mode/mode.rbuild
similarity index 100%
rename from rosapps/cmdutils/mode/mode.rbuild
rename to rosapps/applications/cmdutils/mode/mode.rbuild
diff --git a/rosapps/cmdutils/mode/mode.rc b/rosapps/applications/cmdutils/mode/mode.rc
similarity index 100%
rename from rosapps/cmdutils/mode/mode.rc
rename to rosapps/applications/cmdutils/mode/mode.rc
diff --git a/rosapps/cmdutils/sort/sort.c b/rosapps/applications/cmdutils/sort/sort.c
similarity index 100%
rename from rosapps/cmdutils/sort/sort.c
rename to rosapps/applications/cmdutils/sort/sort.c
diff --git a/rosapps/cmdutils/sort/sort.rbuild b/rosapps/applications/cmdutils/sort/sort.rbuild
similarity index 100%
rename from rosapps/cmdutils/sort/sort.rbuild
rename to rosapps/applications/cmdutils/sort/sort.rbuild
diff --git a/rosapps/cmdutils/sort/sort.rc b/rosapps/applications/cmdutils/sort/sort.rc
similarity index 100%
rename from rosapps/cmdutils/sort/sort.rc
rename to rosapps/applications/cmdutils/sort/sort.rc
diff --git a/rosapps/cmdutils/tee/tee.c b/rosapps/applications/cmdutils/tee/tee.c
similarity index 100%
rename from rosapps/cmdutils/tee/tee.c
rename to rosapps/applications/cmdutils/tee/tee.c
diff --git a/rosapps/cmdutils/tee/tee.rbuild b/rosapps/applications/cmdutils/tee/tee.rbuild
similarity index 100%
rename from rosapps/cmdutils/tee/tee.rbuild
rename to rosapps/applications/cmdutils/tee/tee.rbuild
diff --git a/rosapps/cmdutils/tee/tee.rc b/rosapps/applications/cmdutils/tee/tee.rc
similarity index 100%
rename from rosapps/cmdutils/tee/tee.rc
rename to rosapps/applications/cmdutils/tee/tee.rc
diff --git a/rosapps/cmdutils/touch/err.c b/rosapps/applications/cmdutils/touch/err.c
similarity index 100%
rename from rosapps/cmdutils/touch/err.c
rename to rosapps/applications/cmdutils/touch/err.c
diff --git a/rosapps/cmdutils/touch/err.h b/rosapps/applications/cmdutils/touch/err.h
similarity index 100%
rename from rosapps/cmdutils/touch/err.h
rename to rosapps/applications/cmdutils/touch/err.h
diff --git a/rosapps/cmdutils/touch/touch.c b/rosapps/applications/cmdutils/touch/touch.c
similarity index 100%
rename from rosapps/cmdutils/touch/touch.c
rename to rosapps/applications/cmdutils/touch/touch.c
diff --git a/rosapps/cmdutils/touch/touch.rbuild b/rosapps/applications/cmdutils/touch/touch.rbuild
similarity index 100%
rename from rosapps/cmdutils/touch/touch.rbuild
rename to rosapps/applications/cmdutils/touch/touch.rbuild
diff --git a/rosapps/cmdutils/touch/touch.rc b/rosapps/applications/cmdutils/touch/touch.rc
similarity index 100%
rename from rosapps/cmdutils/touch/touch.rc
rename to rosapps/applications/cmdutils/touch/touch.rc
diff --git a/rosapps/cmdutils/touch/various.h b/rosapps/applications/cmdutils/touch/various.h
similarity index 100%
rename from rosapps/cmdutils/touch/various.h
rename to rosapps/applications/cmdutils/touch/various.h
diff --git a/rosapps/cmdutils/uptime/uptime.c b/rosapps/applications/cmdutils/uptime/uptime.c
similarity index 100%
rename from rosapps/cmdutils/uptime/uptime.c
rename to rosapps/applications/cmdutils/uptime/uptime.c
diff --git a/rosapps/cmdutils/uptime/uptime.rbuild b/rosapps/applications/cmdutils/uptime/uptime.rbuild
similarity index 100%
rename from rosapps/cmdutils/uptime/uptime.rbuild
rename to rosapps/applications/cmdutils/uptime/uptime.rbuild
diff --git a/rosapps/cmdutils/uptime/uptime.rc b/rosapps/applications/cmdutils/uptime/uptime.rc
similarity index 100%
rename from rosapps/cmdutils/uptime/uptime.rc
rename to rosapps/applications/cmdutils/uptime/uptime.rc
diff --git a/rosapps/cmdutils/y/y.c b/rosapps/applications/cmdutils/y/y.c
similarity index 100%
rename from rosapps/cmdutils/y/y.c
rename to rosapps/applications/cmdutils/y/y.c
diff --git a/rosapps/cmdutils/y/y.rbuild b/rosapps/applications/cmdutils/y/y.rbuild
similarity index 100%
rename from rosapps/cmdutils/y/y.rbuild
rename to rosapps/applications/cmdutils/y/y.rbuild
diff --git a/rosapps/cmdutils/y/y.rc b/rosapps/applications/cmdutils/y/y.rc
similarity index 100%
rename from rosapps/cmdutils/y/y.rc
rename to rosapps/applications/cmdutils/y/y.rc
diff --git a/rosapps/devutils/cputointel/AnyalsingProcess.c b/rosapps/applications/devutils/cputointel/AnyalsingProcess.c
similarity index 100%
rename from rosapps/devutils/cputointel/AnyalsingProcess.c
rename to rosapps/applications/devutils/cputointel/AnyalsingProcess.c
diff --git a/rosapps/devutils/cputointel/ConvertToIA32Process.c b/rosapps/applications/devutils/cputointel/ConvertToIA32Process.c
similarity index 100%
rename from rosapps/devutils/cputointel/ConvertToIA32Process.c
rename to rosapps/applications/devutils/cputointel/ConvertToIA32Process.c
diff --git a/rosapps/devutils/cputointel/ConvertToPPCProcess.c b/rosapps/applications/devutils/cputointel/ConvertToPPCProcess.c
similarity index 100%
rename from rosapps/devutils/cputointel/ConvertToPPCProcess.c
rename to rosapps/applications/devutils/cputointel/ConvertToPPCProcess.c
diff --git a/rosapps/devutils/cputointel/ConvertingProcess.c b/rosapps/applications/devutils/cputointel/ConvertingProcess.c
similarity index 100%
rename from rosapps/devutils/cputointel/ConvertingProcess.c
rename to rosapps/applications/devutils/cputointel/ConvertingProcess.c
diff --git a/rosapps/devutils/cputointel/CpuToIntel.c b/rosapps/applications/devutils/cputointel/CpuToIntel.c
similarity index 100%
rename from rosapps/devutils/cputointel/CpuToIntel.c
rename to rosapps/applications/devutils/cputointel/CpuToIntel.c
diff --git a/rosapps/devutils/cputointel/From/ARM/ARM.h b/rosapps/applications/devutils/cputointel/From/ARM/ARM.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/ARM/ARM.h
rename to rosapps/applications/devutils/cputointel/From/ARM/ARM.h
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMBrain.c b/rosapps/applications/devutils/cputointel/From/ARM/ARMBrain.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/ARM/ARMBrain.c
rename to rosapps/applications/devutils/cputointel/From/ARM/ARMBrain.c
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMBrain.h b/rosapps/applications/devutils/cputointel/From/ARM/ARMBrain.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/ARM/ARMBrain.h
rename to rosapps/applications/devutils/cputointel/From/ARM/ARMBrain.h
diff --git a/rosapps/devutils/cputointel/From/ARM/ARMopcode.c b/rosapps/applications/devutils/cputointel/From/ARM/ARMopcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/ARM/ARMopcode.c
rename to rosapps/applications/devutils/cputointel/From/ARM/ARMopcode.c
diff --git a/rosapps/devutils/cputointel/From/IA32/IA32.h b/rosapps/applications/devutils/cputointel/From/IA32/IA32.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/IA32/IA32.h
rename to rosapps/applications/devutils/cputointel/From/IA32/IA32.h
diff --git a/rosapps/devutils/cputointel/From/IA32/IA32Brain.c b/rosapps/applications/devutils/cputointel/From/IA32/IA32Brain.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/IA32/IA32Brain.c
rename to rosapps/applications/devutils/cputointel/From/IA32/IA32Brain.c
diff --git a/rosapps/devutils/cputointel/From/IA32/IA32Brain.h b/rosapps/applications/devutils/cputointel/From/IA32/IA32Brain.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/IA32/IA32Brain.h
rename to rosapps/applications/devutils/cputointel/From/IA32/IA32Brain.h
diff --git a/rosapps/devutils/cputointel/From/IA32/IA32opcode.c b/rosapps/applications/devutils/cputointel/From/IA32/IA32opcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/IA32/IA32opcode.c
rename to rosapps/applications/devutils/cputointel/From/IA32/IA32opcode.c
diff --git a/rosapps/devutils/cputointel/From/PPC/PPC.h b/rosapps/applications/devutils/cputointel/From/PPC/PPC.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/PPC/PPC.h
rename to rosapps/applications/devutils/cputointel/From/PPC/PPC.h
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCBrain.c b/rosapps/applications/devutils/cputointel/From/PPC/PPCBrain.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/PPC/PPCBrain.c
rename to rosapps/applications/devutils/cputointel/From/PPC/PPCBrain.c
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCBrain.h b/rosapps/applications/devutils/cputointel/From/PPC/PPCBrain.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/PPC/PPCBrain.h
rename to rosapps/applications/devutils/cputointel/From/PPC/PPCBrain.h
diff --git a/rosapps/devutils/cputointel/From/PPC/PPCopcode.c b/rosapps/applications/devutils/cputointel/From/PPC/PPCopcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/PPC/PPCopcode.c
rename to rosapps/applications/devutils/cputointel/From/PPC/PPCopcode.c
diff --git a/rosapps/devutils/cputointel/From/dummycpu/Dummy.h b/rosapps/applications/devutils/cputointel/From/dummycpu/Dummy.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/dummycpu/Dummy.h
rename to rosapps/applications/devutils/cputointel/From/dummycpu/Dummy.h
diff --git a/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c b/rosapps/applications/devutils/cputointel/From/dummycpu/DummyBrain.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/dummycpu/DummyBrain.c
rename to rosapps/applications/devutils/cputointel/From/dummycpu/DummyBrain.c
diff --git a/rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h b/rosapps/applications/devutils/cputointel/From/dummycpu/DummyBrain.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/dummycpu/DummyBrain.h
rename to rosapps/applications/devutils/cputointel/From/dummycpu/DummyBrain.h
diff --git a/rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c b/rosapps/applications/devutils/cputointel/From/dummycpu/Dummyopcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/dummycpu/Dummyopcode.c
rename to rosapps/applications/devutils/cputointel/From/dummycpu/Dummyopcode.c
diff --git a/rosapps/devutils/cputointel/From/m68k/M68kBrain.c b/rosapps/applications/devutils/cputointel/From/m68k/M68kBrain.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/m68k/M68kBrain.c
rename to rosapps/applications/devutils/cputointel/From/m68k/M68kBrain.c
diff --git a/rosapps/devutils/cputointel/From/m68k/M68kBrain.h b/rosapps/applications/devutils/cputointel/From/m68k/M68kBrain.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/m68k/M68kBrain.h
rename to rosapps/applications/devutils/cputointel/From/m68k/M68kBrain.h
diff --git a/rosapps/devutils/cputointel/From/m68k/M68kopcode.c b/rosapps/applications/devutils/cputointel/From/m68k/M68kopcode.c
similarity index 100%
rename from rosapps/devutils/cputointel/From/m68k/M68kopcode.c
rename to rosapps/applications/devutils/cputointel/From/m68k/M68kopcode.c
diff --git a/rosapps/devutils/cputointel/From/m68k/m68k.h b/rosapps/applications/devutils/cputointel/From/m68k/m68k.h
similarity index 100%
rename from rosapps/devutils/cputointel/From/m68k/m68k.h
rename to rosapps/applications/devutils/cputointel/From/m68k/m68k.h
diff --git a/rosapps/devutils/cputointel/ImageLoader.c b/rosapps/applications/devutils/cputointel/ImageLoader.c
similarity index 100%
rename from rosapps/devutils/cputointel/ImageLoader.c
rename to rosapps/applications/devutils/cputointel/ImageLoader.c
diff --git a/rosapps/devutils/cputointel/OpCodePPC.txt b/rosapps/applications/devutils/cputointel/OpCodePPC.txt
similarity index 100%
rename from rosapps/devutils/cputointel/OpCodePPC.txt
rename to rosapps/applications/devutils/cputointel/OpCodePPC.txt
diff --git a/rosapps/devutils/cputointel/ReadMe.txt b/rosapps/applications/devutils/cputointel/ReadMe.txt
similarity index 100%
rename from rosapps/devutils/cputointel/ReadMe.txt
rename to rosapps/applications/devutils/cputointel/ReadMe.txt
diff --git a/rosapps/devutils/cputointel/any_op.h b/rosapps/applications/devutils/cputointel/any_op.h
similarity index 100%
rename from rosapps/devutils/cputointel/any_op.h
rename to rosapps/applications/devutils/cputointel/any_op.h
diff --git a/rosapps/devutils/cputointel/cputointel.rbuild b/rosapps/applications/devutils/cputointel/cputointel.rbuild
similarity index 100%
rename from rosapps/devutils/cputointel/cputointel.rbuild
rename to rosapps/applications/devutils/cputointel/cputointel.rbuild
diff --git a/rosapps/devutils/cputointel/misc.c b/rosapps/applications/devutils/cputointel/misc.c
similarity index 100%
rename from rosapps/devutils/cputointel/misc.c
rename to rosapps/applications/devutils/cputointel/misc.c
diff --git a/rosapps/devutils/cputointel/misc.h b/rosapps/applications/devutils/cputointel/misc.h
similarity index 100%
rename from rosapps/devutils/cputointel/misc.h
rename to rosapps/applications/devutils/cputointel/misc.h
diff --git a/rosapps/devutils/directory.rbuild b/rosapps/applications/devutils/directory.rbuild
similarity index 100%
rename from rosapps/devutils/directory.rbuild
rename to rosapps/applications/devutils/directory.rbuild
diff --git a/rosapps/devutils/gdb2/README b/rosapps/applications/devutils/gdb2/README
similarity index 100%
rename from rosapps/devutils/gdb2/README
rename to rosapps/applications/devutils/gdb2/README
diff --git a/rosapps/devutils/gdb2/gdb2.cpp b/rosapps/applications/devutils/gdb2/gdb2.cpp
similarity index 100%
rename from rosapps/devutils/gdb2/gdb2.cpp
rename to rosapps/applications/devutils/gdb2/gdb2.cpp
diff --git a/rosapps/devutils/gdb2/gdb2.rbuild b/rosapps/applications/devutils/gdb2/gdb2.rbuild
similarity index 100%
rename from rosapps/devutils/gdb2/gdb2.rbuild
rename to rosapps/applications/devutils/gdb2/gdb2.rbuild
diff --git a/rosapps/devutils/gdb2/ph.h b/rosapps/applications/devutils/gdb2/ph.h
similarity index 100%
rename from rosapps/devutils/gdb2/ph.h
rename to rosapps/applications/devutils/gdb2/ph.h
diff --git a/rosapps/devutils/gdihv/gdi.h b/rosapps/applications/devutils/gdihv/gdi.h
similarity index 100%
rename from rosapps/devutils/gdihv/gdi.h
rename to rosapps/applications/devutils/gdihv/gdi.h
diff --git a/rosapps/devutils/gdihv/gdihv.c b/rosapps/applications/devutils/gdihv/gdihv.c
similarity index 100%
rename from rosapps/devutils/gdihv/gdihv.c
rename to rosapps/applications/devutils/gdihv/gdihv.c
diff --git a/rosapps/devutils/gdihv/gdihv.h b/rosapps/applications/devutils/gdihv/gdihv.h
similarity index 100%
rename from rosapps/devutils/gdihv/gdihv.h
rename to rosapps/applications/devutils/gdihv/gdihv.h
diff --git a/rosapps/devutils/gdihv/gdihv.rbuild b/rosapps/applications/devutils/gdihv/gdihv.rbuild
similarity index 100%
rename from rosapps/devutils/gdihv/gdihv.rbuild
rename to rosapps/applications/devutils/gdihv/gdihv.rbuild
diff --git a/rosapps/devutils/gdihv/gdihv.rc b/rosapps/applications/devutils/gdihv/gdihv.rc
similarity index 100%
rename from rosapps/devutils/gdihv/gdihv.rc
rename to rosapps/applications/devutils/gdihv/gdihv.rc
diff --git a/rosapps/devutils/gdihv/handlelist.c b/rosapps/applications/devutils/gdihv/handlelist.c
similarity index 100%
rename from rosapps/devutils/gdihv/handlelist.c
rename to rosapps/applications/devutils/gdihv/handlelist.c
diff --git a/rosapps/devutils/gdihv/handlelist.h b/rosapps/applications/devutils/gdihv/handlelist.h
similarity index 100%
rename from rosapps/devutils/gdihv/handlelist.h
rename to rosapps/applications/devutils/gdihv/handlelist.h
diff --git a/rosapps/devutils/gdihv/mainwnd.c b/rosapps/applications/devutils/gdihv/mainwnd.c
similarity index 100%
rename from rosapps/devutils/gdihv/mainwnd.c
rename to rosapps/applications/devutils/gdihv/mainwnd.c
diff --git a/rosapps/devutils/gdihv/mainwnd.h b/rosapps/applications/devutils/gdihv/mainwnd.h
similarity index 100%
rename from rosapps/devutils/gdihv/mainwnd.h
rename to rosapps/applications/devutils/gdihv/mainwnd.h
diff --git a/rosapps/devutils/gdihv/proclist.c b/rosapps/applications/devutils/gdihv/proclist.c
similarity index 100%
rename from rosapps/devutils/gdihv/proclist.c
rename to rosapps/applications/devutils/gdihv/proclist.c
diff --git a/rosapps/devutils/gdihv/proclist.h b/rosapps/applications/devutils/gdihv/proclist.h
similarity index 100%
rename from rosapps/devutils/gdihv/proclist.h
rename to rosapps/applications/devutils/gdihv/proclist.h
diff --git a/rosapps/devutils/gdihv/resource.h b/rosapps/applications/devutils/gdihv/resource.h
similarity index 100%
rename from rosapps/devutils/gdihv/resource.h
rename to rosapps/applications/devutils/gdihv/resource.h
diff --git a/rosapps/devutils/gdihv/system.ico b/rosapps/applications/devutils/gdihv/system.ico
similarity index 100%
rename from rosapps/devutils/gdihv/system.ico
rename to rosapps/applications/devutils/gdihv/system.ico
diff --git a/rosapps/devutils/genguid/genguid.c b/rosapps/applications/devutils/genguid/genguid.c
similarity index 100%
rename from rosapps/devutils/genguid/genguid.c
rename to rosapps/applications/devutils/genguid/genguid.c
diff --git a/rosapps/devutils/genguid/genguid.rbuild b/rosapps/applications/devutils/genguid/genguid.rbuild
similarity index 100%
rename from rosapps/devutils/genguid/genguid.rbuild
rename to rosapps/applications/devutils/genguid/genguid.rbuild
diff --git a/rosapps/devutils/genguid/genguid.rc b/rosapps/applications/devutils/genguid/genguid.rc
similarity index 100%
rename from rosapps/devutils/genguid/genguid.rc
rename to rosapps/applications/devutils/genguid/genguid.rc
diff --git a/rosapps/devutils/roswebparser/Windows28591.h b/rosapps/applications/devutils/roswebparser/Windows28591.h
similarity index 100%
rename from rosapps/devutils/roswebparser/Windows28591.h
rename to rosapps/applications/devutils/roswebparser/Windows28591.h
diff --git a/rosapps/devutils/roswebparser/Windows28592.h b/rosapps/applications/devutils/roswebparser/Windows28592.h
similarity index 100%
rename from rosapps/devutils/roswebparser/Windows28592.h
rename to rosapps/applications/devutils/roswebparser/Windows28592.h
diff --git a/rosapps/devutils/roswebparser/oem437.h b/rosapps/applications/devutils/roswebparser/oem437.h
similarity index 100%
rename from rosapps/devutils/roswebparser/oem437.h
rename to rosapps/applications/devutils/roswebparser/oem437.h
diff --git a/rosapps/devutils/roswebparser/oem850.h b/rosapps/applications/devutils/roswebparser/oem850.h
similarity index 100%
rename from rosapps/devutils/roswebparser/oem850.h
rename to rosapps/applications/devutils/roswebparser/oem850.h
diff --git a/rosapps/devutils/roswebparser/roswebparser.c b/rosapps/applications/devutils/roswebparser/roswebparser.c
similarity index 100%
rename from rosapps/devutils/roswebparser/roswebparser.c
rename to rosapps/applications/devutils/roswebparser/roswebparser.c
diff --git a/rosapps/devutils/roswebparser/roswebparser.rbuild b/rosapps/applications/devutils/roswebparser/roswebparser.rbuild
similarity index 100%
rename from rosapps/devutils/roswebparser/roswebparser.rbuild
rename to rosapps/applications/devutils/roswebparser/roswebparser.rbuild
diff --git a/rosapps/devutils/roswebparser/utf8.c b/rosapps/applications/devutils/roswebparser/utf8.c
similarity index 100%
rename from rosapps/devutils/roswebparser/utf8.c
rename to rosapps/applications/devutils/roswebparser/utf8.c
diff --git a/rosapps/devutils/syscalldump/syscalldump.c b/rosapps/applications/devutils/syscalldump/syscalldump.c
similarity index 100%
rename from rosapps/devutils/syscalldump/syscalldump.c
rename to rosapps/applications/devutils/syscalldump/syscalldump.c
diff --git a/rosapps/devutils/syscalldump/syscalldump.rbuild b/rosapps/applications/devutils/syscalldump/syscalldump.rbuild
similarity index 100%
rename from rosapps/devutils/syscalldump/syscalldump.rbuild
rename to rosapps/applications/devutils/syscalldump/syscalldump.rbuild
diff --git a/rosapps/devutils/vgafontedit/aboutdlg.c b/rosapps/applications/devutils/vgafontedit/aboutdlg.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/aboutdlg.c
rename to rosapps/applications/devutils/vgafontedit/aboutdlg.c
diff --git a/rosapps/devutils/vgafontedit/customwndclasses.h b/rosapps/applications/devutils/vgafontedit/customwndclasses.h
similarity index 100%
rename from rosapps/devutils/vgafontedit/customwndclasses.h
rename to rosapps/applications/devutils/vgafontedit/customwndclasses.h
diff --git a/rosapps/devutils/vgafontedit/editglyphdlg.c b/rosapps/applications/devutils/vgafontedit/editglyphdlg.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/editglyphdlg.c
rename to rosapps/applications/devutils/vgafontedit/editglyphdlg.c
diff --git a/rosapps/devutils/vgafontedit/fileformats.txt b/rosapps/applications/devutils/vgafontedit/fileformats.txt
similarity index 100%
rename from rosapps/devutils/vgafontedit/fileformats.txt
rename to rosapps/applications/devutils/vgafontedit/fileformats.txt
diff --git a/rosapps/devutils/vgafontedit/fontboxeswnd.c b/rosapps/applications/devutils/vgafontedit/fontboxeswnd.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/fontboxeswnd.c
rename to rosapps/applications/devutils/vgafontedit/fontboxeswnd.c
diff --git a/rosapps/devutils/vgafontedit/fontwnd.c b/rosapps/applications/devutils/vgafontedit/fontwnd.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/fontwnd.c
rename to rosapps/applications/devutils/vgafontedit/fontwnd.c
diff --git a/rosapps/devutils/vgafontedit/lang/bg-BG.rc b/rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/bg-BG.rc
rename to rosapps/applications/devutils/vgafontedit/lang/bg-BG.rc
diff --git a/rosapps/devutils/vgafontedit/lang/de-DE.rc b/rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/de-DE.rc
rename to rosapps/applications/devutils/vgafontedit/lang/de-DE.rc
diff --git a/rosapps/devutils/vgafontedit/lang/en-US.rc b/rosapps/applications/devutils/vgafontedit/lang/en-US.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/en-US.rc
rename to rosapps/applications/devutils/vgafontedit/lang/en-US.rc
diff --git a/rosapps/devutils/vgafontedit/lang/es-ES.rc b/rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/es-ES.rc
rename to rosapps/applications/devutils/vgafontedit/lang/es-ES.rc
diff --git a/rosapps/devutils/vgafontedit/lang/fr-FR.rc b/rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/fr-FR.rc
rename to rosapps/applications/devutils/vgafontedit/lang/fr-FR.rc
diff --git a/rosapps/devutils/vgafontedit/lang/it-IT.rc b/rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/it-IT.rc
rename to rosapps/applications/devutils/vgafontedit/lang/it-IT.rc
diff --git a/rosapps/devutils/vgafontedit/lang/pl-PL.rc b/rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/pl-PL.rc
rename to rosapps/applications/devutils/vgafontedit/lang/pl-PL.rc
diff --git a/rosapps/devutils/vgafontedit/lang/ru-RU.rc b/rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/ru-RU.rc
rename to rosapps/applications/devutils/vgafontedit/lang/ru-RU.rc
diff --git a/rosapps/devutils/vgafontedit/lang/uk-UA.rc b/rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/lang/uk-UA.rc
rename to rosapps/applications/devutils/vgafontedit/lang/uk-UA.rc
diff --git a/rosapps/devutils/vgafontedit/main.c b/rosapps/applications/devutils/vgafontedit/main.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/main.c
rename to rosapps/applications/devutils/vgafontedit/main.c
diff --git a/rosapps/devutils/vgafontedit/main.rc b/rosapps/applications/devutils/vgafontedit/main.rc
similarity index 100%
rename from rosapps/devutils/vgafontedit/main.rc
rename to rosapps/applications/devutils/vgafontedit/main.rc
diff --git a/rosapps/devutils/vgafontedit/mainwnd.c b/rosapps/applications/devutils/vgafontedit/mainwnd.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/mainwnd.c
rename to rosapps/applications/devutils/vgafontedit/mainwnd.c
diff --git a/rosapps/devutils/vgafontedit/misc.c b/rosapps/applications/devutils/vgafontedit/misc.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/misc.c
rename to rosapps/applications/devutils/vgafontedit/misc.c
diff --git a/rosapps/devutils/vgafontedit/opensave.c b/rosapps/applications/devutils/vgafontedit/opensave.c
similarity index 100%
rename from rosapps/devutils/vgafontedit/opensave.c
rename to rosapps/applications/devutils/vgafontedit/opensave.c
diff --git a/rosapps/devutils/vgafontedit/precomp.h b/rosapps/applications/devutils/vgafontedit/precomp.h
similarity index 100%
rename from rosapps/devutils/vgafontedit/precomp.h
rename to rosapps/applications/devutils/vgafontedit/precomp.h
diff --git a/rosapps/devutils/vgafontedit/res/doc.ico b/rosapps/applications/devutils/vgafontedit/res/doc.ico
similarity index 100%
rename from rosapps/devutils/vgafontedit/res/doc.ico
rename to rosapps/applications/devutils/vgafontedit/res/doc.ico
diff --git a/rosapps/devutils/vgafontedit/res/main.ico b/rosapps/applications/devutils/vgafontedit/res/main.ico
similarity index 100%
rename from rosapps/devutils/vgafontedit/res/main.ico
rename to rosapps/applications/devutils/vgafontedit/res/main.ico
diff --git a/rosapps/devutils/vgafontedit/res/toolbar.bmp b/rosapps/applications/devutils/vgafontedit/res/toolbar.bmp
similarity index 100%
rename from rosapps/devutils/vgafontedit/res/toolbar.bmp
rename to rosapps/applications/devutils/vgafontedit/res/toolbar.bmp
diff --git a/rosapps/devutils/vgafontedit/res/toolbox.bmp b/rosapps/applications/devutils/vgafontedit/res/toolbox.bmp
similarity index 100%
rename from rosapps/devutils/vgafontedit/res/toolbox.bmp
rename to rosapps/applications/devutils/vgafontedit/res/toolbox.bmp
diff --git a/rosapps/devutils/vgafontedit/resource.h b/rosapps/applications/devutils/vgafontedit/resource.h
similarity index 100%
rename from rosapps/devutils/vgafontedit/resource.h
rename to rosapps/applications/devutils/vgafontedit/resource.h
diff --git a/rosapps/devutils/vgafontedit/vgafontedit.rbuild b/rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
similarity index 100%
rename from rosapps/devutils/vgafontedit/vgafontedit.rbuild
rename to rosapps/applications/devutils/vgafontedit/vgafontedit.rbuild
diff --git a/rosapps/devutils/zoomin/framewnd.c b/rosapps/applications/devutils/zoomin/framewnd.c
similarity index 100%
rename from rosapps/devutils/zoomin/framewnd.c
rename to rosapps/applications/devutils/zoomin/framewnd.c
diff --git a/rosapps/devutils/zoomin/framewnd.h b/rosapps/applications/devutils/zoomin/framewnd.h
similarity index 100%
rename from rosapps/devutils/zoomin/framewnd.h
rename to rosapps/applications/devutils/zoomin/framewnd.h
diff --git a/rosapps/devutils/zoomin/main.c b/rosapps/applications/devutils/zoomin/main.c
similarity index 100%
rename from rosapps/devutils/zoomin/main.c
rename to rosapps/applications/devutils/zoomin/main.c
diff --git a/rosapps/devutils/zoomin/main.h b/rosapps/applications/devutils/zoomin/main.h
similarity index 100%
rename from rosapps/devutils/zoomin/main.h
rename to rosapps/applications/devutils/zoomin/main.h
diff --git a/rosapps/devutils/zoomin/resource.h b/rosapps/applications/devutils/zoomin/resource.h
similarity index 100%
rename from rosapps/devutils/zoomin/resource.h
rename to rosapps/applications/devutils/zoomin/resource.h
diff --git a/rosapps/devutils/zoomin/zoomin.ico b/rosapps/applications/devutils/zoomin/zoomin.ico
similarity index 100%
rename from rosapps/devutils/zoomin/zoomin.ico
rename to rosapps/applications/devutils/zoomin/zoomin.ico
diff --git a/rosapps/devutils/zoomin/zoomin.rbuild b/rosapps/applications/devutils/zoomin/zoomin.rbuild
similarity index 100%
rename from rosapps/devutils/zoomin/zoomin.rbuild
rename to rosapps/applications/devutils/zoomin/zoomin.rbuild
diff --git a/rosapps/devutils/zoomin/zoomin.rc b/rosapps/applications/devutils/zoomin/zoomin.rc
similarity index 100%
rename from rosapps/devutils/zoomin/zoomin.rc
rename to rosapps/applications/devutils/zoomin/zoomin.rc
diff --git a/rosapps/downloader/download.c b/rosapps/applications/downloader/download.c
similarity index 100%
rename from rosapps/downloader/download.c
rename to rosapps/applications/downloader/download.c
diff --git a/rosapps/downloader/downloader.rbuild b/rosapps/applications/downloader/downloader.rbuild
similarity index 100%
rename from rosapps/downloader/downloader.rbuild
rename to rosapps/applications/downloader/downloader.rbuild
diff --git a/rosapps/downloader/downloader.rc b/rosapps/applications/downloader/downloader.rc
similarity index 100%
rename from rosapps/downloader/downloader.rc
rename to rosapps/applications/downloader/downloader.rc
diff --git a/rosapps/downloader/downloader.xml b/rosapps/applications/downloader/downloader.xml
similarity index 100%
rename from rosapps/downloader/downloader.xml
rename to rosapps/applications/downloader/downloader.xml
diff --git a/rosapps/downloader/lang/bg-BG.rc b/rosapps/applications/downloader/lang/bg-BG.rc
similarity index 100%
rename from rosapps/downloader/lang/bg-BG.rc
rename to rosapps/applications/downloader/lang/bg-BG.rc
diff --git a/rosapps/downloader/lang/de-DE.rc b/rosapps/applications/downloader/lang/de-DE.rc
similarity index 100%
rename from rosapps/downloader/lang/de-DE.rc
rename to rosapps/applications/downloader/lang/de-DE.rc
diff --git a/rosapps/downloader/lang/en-US.rc b/rosapps/applications/downloader/lang/en-US.rc
similarity index 100%
rename from rosapps/downloader/lang/en-US.rc
rename to rosapps/applications/downloader/lang/en-US.rc
diff --git a/rosapps/downloader/lang/es-ES.rc b/rosapps/applications/downloader/lang/es-ES.rc
similarity index 100%
rename from rosapps/downloader/lang/es-ES.rc
rename to rosapps/applications/downloader/lang/es-ES.rc
diff --git a/rosapps/downloader/lang/fr-FR.rc b/rosapps/applications/downloader/lang/fr-FR.rc
similarity index 100%
rename from rosapps/downloader/lang/fr-FR.rc
rename to rosapps/applications/downloader/lang/fr-FR.rc
diff --git a/rosapps/downloader/lang/id-ID.rc b/rosapps/applications/downloader/lang/id-ID.rc
similarity index 100%
rename from rosapps/downloader/lang/id-ID.rc
rename to rosapps/applications/downloader/lang/id-ID.rc
diff --git a/rosapps/downloader/lang/it-IT.rc b/rosapps/applications/downloader/lang/it-IT.rc
similarity index 100%
rename from rosapps/downloader/lang/it-IT.rc
rename to rosapps/applications/downloader/lang/it-IT.rc
diff --git a/rosapps/downloader/lang/lt-LT.rc b/rosapps/applications/downloader/lang/lt-LT.rc
similarity index 100%
rename from rosapps/downloader/lang/lt-LT.rc
rename to rosapps/applications/downloader/lang/lt-LT.rc
diff --git a/rosapps/downloader/lang/pl-PL.rc b/rosapps/applications/downloader/lang/pl-PL.rc
similarity index 100%
rename from rosapps/downloader/lang/pl-PL.rc
rename to rosapps/applications/downloader/lang/pl-PL.rc
diff --git a/rosapps/downloader/lang/ru-RU.rc b/rosapps/applications/downloader/lang/ru-RU.rc
similarity index 100%
rename from rosapps/downloader/lang/ru-RU.rc
rename to rosapps/applications/downloader/lang/ru-RU.rc
diff --git a/rosapps/downloader/lang/sk-SK.rc b/rosapps/applications/downloader/lang/sk-SK.rc
similarity index 100%
rename from rosapps/downloader/lang/sk-SK.rc
rename to rosapps/applications/downloader/lang/sk-SK.rc
diff --git a/rosapps/downloader/lang/uk-UA.rc b/rosapps/applications/downloader/lang/uk-UA.rc
similarity index 100%
rename from rosapps/downloader/lang/uk-UA.rc
rename to rosapps/applications/downloader/lang/uk-UA.rc
diff --git a/rosapps/downloader/main.c b/rosapps/applications/downloader/main.c
similarity index 100%
rename from rosapps/downloader/main.c
rename to rosapps/applications/downloader/main.c
diff --git a/rosapps/downloader/patches/d2fix.c b/rosapps/applications/downloader/patches/d2fix.c
similarity index 100%
rename from rosapps/downloader/patches/d2fix.c
rename to rosapps/applications/downloader/patches/d2fix.c
diff --git a/rosapps/downloader/resources.h b/rosapps/applications/downloader/resources.h
similarity index 100%
rename from rosapps/downloader/resources.h
rename to rosapps/applications/downloader/resources.h
diff --git a/rosapps/downloader/resources/0.bmp b/rosapps/applications/downloader/resources/0.bmp
similarity index 100%
rename from rosapps/downloader/resources/0.bmp
rename to rosapps/applications/downloader/resources/0.bmp
diff --git a/rosapps/downloader/resources/1.bmp b/rosapps/applications/downloader/resources/1.bmp
similarity index 100%
rename from rosapps/downloader/resources/1.bmp
rename to rosapps/applications/downloader/resources/1.bmp
diff --git a/rosapps/downloader/resources/10.bmp b/rosapps/applications/downloader/resources/10.bmp
similarity index 100%
rename from rosapps/downloader/resources/10.bmp
rename to rosapps/applications/downloader/resources/10.bmp
diff --git a/rosapps/downloader/resources/11.bmp b/rosapps/applications/downloader/resources/11.bmp
similarity index 100%
rename from rosapps/downloader/resources/11.bmp
rename to rosapps/applications/downloader/resources/11.bmp
diff --git a/rosapps/downloader/resources/12.bmp b/rosapps/applications/downloader/resources/12.bmp
similarity index 100%
rename from rosapps/downloader/resources/12.bmp
rename to rosapps/applications/downloader/resources/12.bmp
diff --git a/rosapps/downloader/resources/13.bmp b/rosapps/applications/downloader/resources/13.bmp
similarity index 100%
rename from rosapps/downloader/resources/13.bmp
rename to rosapps/applications/downloader/resources/13.bmp
diff --git a/rosapps/downloader/resources/2.bmp b/rosapps/applications/downloader/resources/2.bmp
similarity index 100%
rename from rosapps/downloader/resources/2.bmp
rename to rosapps/applications/downloader/resources/2.bmp
diff --git a/rosapps/downloader/resources/3.bmp b/rosapps/applications/downloader/resources/3.bmp
similarity index 100%
rename from rosapps/downloader/resources/3.bmp
rename to rosapps/applications/downloader/resources/3.bmp
diff --git a/rosapps/downloader/resources/4.bmp b/rosapps/applications/downloader/resources/4.bmp
similarity index 100%
rename from rosapps/downloader/resources/4.bmp
rename to rosapps/applications/downloader/resources/4.bmp
diff --git a/rosapps/downloader/resources/5.bmp b/rosapps/applications/downloader/resources/5.bmp
similarity index 100%
rename from rosapps/downloader/resources/5.bmp
rename to rosapps/applications/downloader/resources/5.bmp
diff --git a/rosapps/downloader/resources/6.bmp b/rosapps/applications/downloader/resources/6.bmp
similarity index 100%
rename from rosapps/downloader/resources/6.bmp
rename to rosapps/applications/downloader/resources/6.bmp
diff --git a/rosapps/downloader/resources/7.bmp b/rosapps/applications/downloader/resources/7.bmp
similarity index 100%
rename from rosapps/downloader/resources/7.bmp
rename to rosapps/applications/downloader/resources/7.bmp
diff --git a/rosapps/downloader/resources/8.bmp b/rosapps/applications/downloader/resources/8.bmp
similarity index 100%
rename from rosapps/downloader/resources/8.bmp
rename to rosapps/applications/downloader/resources/8.bmp
diff --git a/rosapps/downloader/resources/9.bmp b/rosapps/applications/downloader/resources/9.bmp
similarity index 100%
rename from rosapps/downloader/resources/9.bmp
rename to rosapps/applications/downloader/resources/9.bmp
diff --git a/rosapps/downloader/resources/download.bmp b/rosapps/applications/downloader/resources/download.bmp
similarity index 100%
rename from rosapps/downloader/resources/download.bmp
rename to rosapps/applications/downloader/resources/download.bmp
diff --git a/rosapps/downloader/resources/help.ico b/rosapps/applications/downloader/resources/help.ico
similarity index 100%
rename from rosapps/downloader/resources/help.ico
rename to rosapps/applications/downloader/resources/help.ico
diff --git a/rosapps/downloader/resources/logo.bmp b/rosapps/applications/downloader/resources/logo.bmp
similarity index 100%
rename from rosapps/downloader/resources/logo.bmp
rename to rosapps/applications/downloader/resources/logo.bmp
diff --git a/rosapps/downloader/resources/main.ico b/rosapps/applications/downloader/resources/main.ico
similarity index 100%
rename from rosapps/downloader/resources/main.ico
rename to rosapps/applications/downloader/resources/main.ico
diff --git a/rosapps/downloader/resources/preferences.ico b/rosapps/applications/downloader/resources/preferences.ico
similarity index 100%
rename from rosapps/downloader/resources/preferences.ico
rename to rosapps/applications/downloader/resources/preferences.ico
diff --git a/rosapps/downloader/resources/underline.bmp b/rosapps/applications/downloader/resources/underline.bmp
similarity index 100%
rename from rosapps/downloader/resources/underline.bmp
rename to rosapps/applications/downloader/resources/underline.bmp
diff --git a/rosapps/downloader/resources/uninstall.bmp b/rosapps/applications/downloader/resources/uninstall.bmp
similarity index 100%
rename from rosapps/downloader/resources/uninstall.bmp
rename to rosapps/applications/downloader/resources/uninstall.bmp
diff --git a/rosapps/downloader/resources/update.ico b/rosapps/applications/downloader/resources/update.ico
similarity index 100%
rename from rosapps/downloader/resources/update.ico
rename to rosapps/applications/downloader/resources/update.ico
diff --git a/rosapps/downloader/rsrc.rc b/rosapps/applications/downloader/rsrc.rc
similarity index 100%
rename from rosapps/downloader/rsrc.rc
rename to rosapps/applications/downloader/rsrc.rc
diff --git a/rosapps/downloader/structures.h b/rosapps/applications/downloader/structures.h
similarity index 100%
rename from rosapps/downloader/structures.h
rename to rosapps/applications/downloader/structures.h
diff --git a/rosapps/downloader/xml.c b/rosapps/applications/downloader/xml.c
similarity index 100%
rename from rosapps/downloader/xml.c
rename to rosapps/applications/downloader/xml.c
diff --git a/rosapps/fontview/display.c b/rosapps/applications/fontview/display.c
similarity index 100%
rename from rosapps/fontview/display.c
rename to rosapps/applications/fontview/display.c
diff --git a/rosapps/fontview/display.h b/rosapps/applications/fontview/display.h
similarity index 100%
rename from rosapps/fontview/display.h
rename to rosapps/applications/fontview/display.h
diff --git a/rosapps/fontview/fontview.c b/rosapps/applications/fontview/fontview.c
similarity index 100%
rename from rosapps/fontview/fontview.c
rename to rosapps/applications/fontview/fontview.c
diff --git a/rosapps/fontview/fontview.h b/rosapps/applications/fontview/fontview.h
similarity index 100%
rename from rosapps/fontview/fontview.h
rename to rosapps/applications/fontview/fontview.h
diff --git a/rosapps/fontview/fontview.rbuild b/rosapps/applications/fontview/fontview.rbuild
similarity index 100%
rename from rosapps/fontview/fontview.rbuild
rename to rosapps/applications/fontview/fontview.rbuild
diff --git a/rosapps/fontview/fontview.rc b/rosapps/applications/fontview/fontview.rc
similarity index 100%
rename from rosapps/fontview/fontview.rc
rename to rosapps/applications/fontview/fontview.rc
diff --git a/rosapps/fontview/lang/bg-BG.rc b/rosapps/applications/fontview/lang/bg-BG.rc
similarity index 100%
rename from rosapps/fontview/lang/bg-BG.rc
rename to rosapps/applications/fontview/lang/bg-BG.rc
diff --git a/rosapps/fontview/lang/de-DE.rc b/rosapps/applications/fontview/lang/de-DE.rc
similarity index 100%
rename from rosapps/fontview/lang/de-DE.rc
rename to rosapps/applications/fontview/lang/de-DE.rc
diff --git a/rosapps/fontview/lang/en-US.rc b/rosapps/applications/fontview/lang/en-US.rc
similarity index 100%
rename from rosapps/fontview/lang/en-US.rc
rename to rosapps/applications/fontview/lang/en-US.rc
diff --git a/rosapps/fontview/lang/es-ES.rc b/rosapps/applications/fontview/lang/es-ES.rc
similarity index 100%
rename from rosapps/fontview/lang/es-ES.rc
rename to rosapps/applications/fontview/lang/es-ES.rc
diff --git a/rosapps/fontview/lang/fr-FR.rc b/rosapps/applications/fontview/lang/fr-FR.rc
similarity index 100%
rename from rosapps/fontview/lang/fr-FR.rc
rename to rosapps/applications/fontview/lang/fr-FR.rc
diff --git a/rosapps/fontview/lang/lt-LT.rc b/rosapps/applications/fontview/lang/lt-LT.rc
similarity index 100%
rename from rosapps/fontview/lang/lt-LT.rc
rename to rosapps/applications/fontview/lang/lt-LT.rc
diff --git a/rosapps/fontview/lang/pl-PL.rc b/rosapps/applications/fontview/lang/pl-PL.rc
similarity index 100%
rename from rosapps/fontview/lang/pl-PL.rc
rename to rosapps/applications/fontview/lang/pl-PL.rc
diff --git a/rosapps/fontview/lang/ru-RU.rc b/rosapps/applications/fontview/lang/ru-RU.rc
similarity index 100%
rename from rosapps/fontview/lang/ru-RU.rc
rename to rosapps/applications/fontview/lang/ru-RU.rc
diff --git a/rosapps/fontview/lang/sk-SK.rc b/rosapps/applications/fontview/lang/sk-SK.rc
similarity index 100%
rename from rosapps/fontview/lang/sk-SK.rc
rename to rosapps/applications/fontview/lang/sk-SK.rc
diff --git a/rosapps/fontview/lang/uk-UA.rc b/rosapps/applications/fontview/lang/uk-UA.rc
similarity index 100%
rename from rosapps/fontview/lang/uk-UA.rc
rename to rosapps/applications/fontview/lang/uk-UA.rc
diff --git a/rosapps/fontview/resource.h b/rosapps/applications/fontview/resource.h
similarity index 100%
rename from rosapps/fontview/resource.h
rename to rosapps/applications/fontview/resource.h
diff --git a/rosapps/fontview/ttf.ico b/rosapps/applications/fontview/ttf.ico
similarity index 100%
rename from rosapps/fontview/ttf.ico
rename to rosapps/applications/fontview/ttf.ico
diff --git a/rosapps/fraginator/DefragDialog.cpp b/rosapps/applications/fraginator/DefragDialog.cpp
similarity index 100%
rename from rosapps/fraginator/DefragDialog.cpp
rename to rosapps/applications/fraginator/DefragDialog.cpp
diff --git a/rosapps/fraginator/Defragment.cpp b/rosapps/applications/fraginator/Defragment.cpp
similarity index 100%
rename from rosapps/fraginator/Defragment.cpp
rename to rosapps/applications/fraginator/Defragment.cpp
diff --git a/rosapps/fraginator/Defragment.h b/rosapps/applications/fraginator/Defragment.h
similarity index 100%
rename from rosapps/fraginator/Defragment.h
rename to rosapps/applications/fraginator/Defragment.h
diff --git a/rosapps/fraginator/DriveVolume.cpp b/rosapps/applications/fraginator/DriveVolume.cpp
similarity index 100%
rename from rosapps/fraginator/DriveVolume.cpp
rename to rosapps/applications/fraginator/DriveVolume.cpp
diff --git a/rosapps/fraginator/DriveVolume.h b/rosapps/applications/fraginator/DriveVolume.h
similarity index 100%
rename from rosapps/fraginator/DriveVolume.h
rename to rosapps/applications/fraginator/DriveVolume.h
diff --git a/rosapps/fraginator/Fraginator Motif Icon.bmp b/rosapps/applications/fraginator/Fraginator Motif Icon.bmp
similarity index 100%
rename from rosapps/fraginator/Fraginator Motif Icon.bmp
rename to rosapps/applications/fraginator/Fraginator Motif Icon.bmp
diff --git a/rosapps/fraginator/Fraginator.cpp b/rosapps/applications/fraginator/Fraginator.cpp
similarity index 100%
rename from rosapps/fraginator/Fraginator.cpp
rename to rosapps/applications/fraginator/Fraginator.cpp
diff --git a/rosapps/fraginator/Fraginator.h b/rosapps/applications/fraginator/Fraginator.h
similarity index 100%
rename from rosapps/fraginator/Fraginator.h
rename to rosapps/applications/fraginator/Fraginator.h
diff --git a/rosapps/fraginator/Fraginator.rc b/rosapps/applications/fraginator/Fraginator.rc
similarity index 100%
rename from rosapps/fraginator/Fraginator.rc
rename to rosapps/applications/fraginator/Fraginator.rc
diff --git a/rosapps/fraginator/MainDialog.cpp b/rosapps/applications/fraginator/MainDialog.cpp
similarity index 100%
rename from rosapps/fraginator/MainDialog.cpp
rename to rosapps/applications/fraginator/MainDialog.cpp
diff --git a/rosapps/fraginator/MainDialog.h b/rosapps/applications/fraginator/MainDialog.h
similarity index 100%
rename from rosapps/fraginator/MainDialog.h
rename to rosapps/applications/fraginator/MainDialog.h
diff --git a/rosapps/fraginator/Mutex.h b/rosapps/applications/fraginator/Mutex.h
similarity index 100%
rename from rosapps/fraginator/Mutex.h
rename to rosapps/applications/fraginator/Mutex.h
diff --git a/rosapps/fraginator/ReportDialog.cpp b/rosapps/applications/fraginator/ReportDialog.cpp
similarity index 100%
rename from rosapps/fraginator/ReportDialog.cpp
rename to rosapps/applications/fraginator/ReportDialog.cpp
diff --git a/rosapps/fraginator/ReportDialog.h b/rosapps/applications/fraginator/ReportDialog.h
similarity index 100%
rename from rosapps/fraginator/ReportDialog.h
rename to rosapps/applications/fraginator/ReportDialog.h
diff --git a/rosapps/fraginator/Unfrag.cpp b/rosapps/applications/fraginator/Unfrag.cpp
similarity index 100%
rename from rosapps/fraginator/Unfrag.cpp
rename to rosapps/applications/fraginator/Unfrag.cpp
diff --git a/rosapps/fraginator/Unfrag.h b/rosapps/applications/fraginator/Unfrag.h
similarity index 100%
rename from rosapps/fraginator/Unfrag.h
rename to rosapps/applications/fraginator/Unfrag.h
diff --git a/rosapps/fraginator/fraginator.rbuild b/rosapps/applications/fraginator/fraginator.rbuild
similarity index 100%
rename from rosapps/fraginator/fraginator.rbuild
rename to rosapps/applications/fraginator/fraginator.rbuild
diff --git a/rosapps/fraginator/icon1.ico b/rosapps/applications/fraginator/icon1.ico
similarity index 100%
rename from rosapps/fraginator/icon1.ico
rename to rosapps/applications/fraginator/icon1.ico
diff --git a/rosapps/fraginator/resource.h b/rosapps/applications/fraginator/resource.h
similarity index 100%
rename from rosapps/fraginator/resource.h
rename to rosapps/applications/fraginator/resource.h
diff --git a/rosapps/gettype/gettype.c b/rosapps/applications/gettype/gettype.c
similarity index 100%
rename from rosapps/gettype/gettype.c
rename to rosapps/applications/gettype/gettype.c
diff --git a/rosapps/gettype/gettype.rbuild b/rosapps/applications/gettype/gettype.rbuild
similarity index 100%
rename from rosapps/gettype/gettype.rbuild
rename to rosapps/applications/gettype/gettype.rbuild
diff --git a/rosapps/imagesoft/about.c b/rosapps/applications/imagesoft/about.c
similarity index 100%
rename from rosapps/imagesoft/about.c
rename to rosapps/applications/imagesoft/about.c
diff --git a/rosapps/imagesoft/adjust.c b/rosapps/applications/imagesoft/adjust.c
similarity index 100%
rename from rosapps/imagesoft/adjust.c
rename to rosapps/applications/imagesoft/adjust.c
diff --git a/rosapps/imagesoft/brightness.c b/rosapps/applications/imagesoft/brightness.c
similarity index 100%
rename from rosapps/imagesoft/brightness.c
rename to rosapps/applications/imagesoft/brightness.c
diff --git a/rosapps/imagesoft/contrast.c b/rosapps/applications/imagesoft/contrast.c
similarity index 100%
rename from rosapps/imagesoft/contrast.c
rename to rosapps/applications/imagesoft/contrast.c
diff --git a/rosapps/imagesoft/custcombo.c b/rosapps/applications/imagesoft/custcombo.c
similarity index 100%
rename from rosapps/imagesoft/custcombo.c
rename to rosapps/applications/imagesoft/custcombo.c
diff --git a/rosapps/imagesoft/floatwindow.c b/rosapps/applications/imagesoft/floatwindow.c
similarity index 100%
rename from rosapps/imagesoft/floatwindow.c
rename to rosapps/applications/imagesoft/floatwindow.c
diff --git a/rosapps/imagesoft/font.c b/rosapps/applications/imagesoft/font.c
similarity index 100%
rename from rosapps/imagesoft/font.c
rename to rosapps/applications/imagesoft/font.c
diff --git a/rosapps/imagesoft/imageprop.h b/rosapps/applications/imagesoft/imageprop.h
similarity index 100%
rename from rosapps/imagesoft/imageprop.h
rename to rosapps/applications/imagesoft/imageprop.h
diff --git a/rosapps/imagesoft/imagesoft.c b/rosapps/applications/imagesoft/imagesoft.c
similarity index 100%
rename from rosapps/imagesoft/imagesoft.c
rename to rosapps/applications/imagesoft/imagesoft.c
diff --git a/rosapps/imagesoft/imagesoft.rbuild b/rosapps/applications/imagesoft/imagesoft.rbuild
similarity index 100%
rename from rosapps/imagesoft/imagesoft.rbuild
rename to rosapps/applications/imagesoft/imagesoft.rbuild
diff --git a/rosapps/imagesoft/imagesoft.rc b/rosapps/applications/imagesoft/imagesoft.rc
similarity index 100%
rename from rosapps/imagesoft/imagesoft.rc
rename to rosapps/applications/imagesoft/imagesoft.rc
diff --git a/rosapps/imagesoft/imgedwnd.c b/rosapps/applications/imagesoft/imgedwnd.c
similarity index 100%
rename from rosapps/imagesoft/imgedwnd.c
rename to rosapps/applications/imagesoft/imgedwnd.c
diff --git a/rosapps/imagesoft/imgedwnd.h b/rosapps/applications/imagesoft/imgedwnd.h
similarity index 100%
rename from rosapps/imagesoft/imgedwnd.h
rename to rosapps/applications/imagesoft/imgedwnd.h
diff --git a/rosapps/imagesoft/lang/bg-BG.rc b/rosapps/applications/imagesoft/lang/bg-BG.rc
similarity index 100%
rename from rosapps/imagesoft/lang/bg-BG.rc
rename to rosapps/applications/imagesoft/lang/bg-BG.rc
diff --git a/rosapps/imagesoft/lang/en-GB.rc b/rosapps/applications/imagesoft/lang/en-GB.rc
similarity index 100%
rename from rosapps/imagesoft/lang/en-GB.rc
rename to rosapps/applications/imagesoft/lang/en-GB.rc
diff --git a/rosapps/imagesoft/lang/en-US.rc b/rosapps/applications/imagesoft/lang/en-US.rc
similarity index 100%
rename from rosapps/imagesoft/lang/en-US.rc
rename to rosapps/applications/imagesoft/lang/en-US.rc
diff --git a/rosapps/imagesoft/lang/es-ES.rc b/rosapps/applications/imagesoft/lang/es-ES.rc
similarity index 100%
rename from rosapps/imagesoft/lang/es-ES.rc
rename to rosapps/applications/imagesoft/lang/es-ES.rc
diff --git a/rosapps/imagesoft/lang/fr-FR.rc b/rosapps/applications/imagesoft/lang/fr-FR.rc
similarity index 100%
rename from rosapps/imagesoft/lang/fr-FR.rc
rename to rosapps/applications/imagesoft/lang/fr-FR.rc
diff --git a/rosapps/imagesoft/lang/id-ID.rc b/rosapps/applications/imagesoft/lang/id-ID.rc
similarity index 100%
rename from rosapps/imagesoft/lang/id-ID.rc
rename to rosapps/applications/imagesoft/lang/id-ID.rc
diff --git a/rosapps/imagesoft/lang/it-IT.rc b/rosapps/applications/imagesoft/lang/it-IT.rc
similarity index 100%
rename from rosapps/imagesoft/lang/it-IT.rc
rename to rosapps/applications/imagesoft/lang/it-IT.rc
diff --git a/rosapps/imagesoft/lang/nb-NO.rc b/rosapps/applications/imagesoft/lang/nb-NO.rc
similarity index 100%
rename from rosapps/imagesoft/lang/nb-NO.rc
rename to rosapps/applications/imagesoft/lang/nb-NO.rc
diff --git a/rosapps/imagesoft/lang/pl-PL.rc b/rosapps/applications/imagesoft/lang/pl-PL.rc
similarity index 100%
rename from rosapps/imagesoft/lang/pl-PL.rc
rename to rosapps/applications/imagesoft/lang/pl-PL.rc
diff --git a/rosapps/imagesoft/lang/ru-RU.rc b/rosapps/applications/imagesoft/lang/ru-RU.rc
similarity index 100%
rename from rosapps/imagesoft/lang/ru-RU.rc
rename to rosapps/applications/imagesoft/lang/ru-RU.rc
diff --git a/rosapps/imagesoft/lang/sk-SK.rc b/rosapps/applications/imagesoft/lang/sk-SK.rc
similarity index 100%
rename from rosapps/imagesoft/lang/sk-SK.rc
rename to rosapps/applications/imagesoft/lang/sk-SK.rc
diff --git a/rosapps/imagesoft/lang/th-TH.rc b/rosapps/applications/imagesoft/lang/th-TH.rc
similarity index 100%
rename from rosapps/imagesoft/lang/th-TH.rc
rename to rosapps/applications/imagesoft/lang/th-TH.rc
diff --git a/rosapps/imagesoft/lang/uk-UA.rc b/rosapps/applications/imagesoft/lang/uk-UA.rc
similarity index 100%
rename from rosapps/imagesoft/lang/uk-UA.rc
rename to rosapps/applications/imagesoft/lang/uk-UA.rc
diff --git a/rosapps/imagesoft/mainwnd.c b/rosapps/applications/imagesoft/mainwnd.c
similarity index 100%
rename from rosapps/imagesoft/mainwnd.c
rename to rosapps/applications/imagesoft/mainwnd.c
diff --git a/rosapps/imagesoft/mainwnd.h b/rosapps/applications/imagesoft/mainwnd.h
similarity index 100%
rename from rosapps/imagesoft/mainwnd.h
rename to rosapps/applications/imagesoft/mainwnd.h
diff --git a/rosapps/imagesoft/misc.c b/rosapps/applications/imagesoft/misc.c
similarity index 100%
rename from rosapps/imagesoft/misc.c
rename to rosapps/applications/imagesoft/misc.c
diff --git a/rosapps/imagesoft/misc.h b/rosapps/applications/imagesoft/misc.h
similarity index 100%
rename from rosapps/imagesoft/misc.h
rename to rosapps/applications/imagesoft/misc.h
diff --git a/rosapps/imagesoft/opensave.c b/rosapps/applications/imagesoft/opensave.c
similarity index 100%
rename from rosapps/imagesoft/opensave.c
rename to rosapps/applications/imagesoft/opensave.c
diff --git a/rosapps/imagesoft/precomp.h b/rosapps/applications/imagesoft/precomp.h
similarity index 100%
rename from rosapps/imagesoft/precomp.h
rename to rosapps/applications/imagesoft/precomp.h
diff --git a/rosapps/imagesoft/res/cursors/PaintBrushToolCursor.cur b/rosapps/applications/imagesoft/res/cursors/PaintBrushToolCursor.cur
similarity index 100%
rename from rosapps/imagesoft/res/cursors/PaintBrushToolCursor.cur
rename to rosapps/applications/imagesoft/res/cursors/PaintBrushToolCursor.cur
diff --git a/rosapps/imagesoft/res/cursors/PaintBrushToolCursorMouseDown.cur b/rosapps/applications/imagesoft/res/cursors/PaintBrushToolCursorMouseDown.cur
similarity index 100%
rename from rosapps/imagesoft/res/cursors/PaintBrushToolCursorMouseDown.cur
rename to rosapps/applications/imagesoft/res/cursors/PaintBrushToolCursorMouseDown.cur
diff --git a/rosapps/imagesoft/res/icons/color/ColorLess.bmp b/rosapps/applications/imagesoft/res/icons/color/ColorLess.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/color/ColorLess.bmp
rename to rosapps/applications/imagesoft/res/icons/color/ColorLess.bmp
diff --git a/rosapps/imagesoft/res/icons/color/ColorMore.bmp b/rosapps/applications/imagesoft/res/icons/color/ColorMore.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/color/ColorMore.bmp
rename to rosapps/applications/imagesoft/res/icons/color/ColorMore.bmp
diff --git a/rosapps/imagesoft/res/icons/hist/HistBack.bmp b/rosapps/applications/imagesoft/res/icons/hist/HistBack.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/hist/HistBack.bmp
rename to rosapps/applications/imagesoft/res/icons/hist/HistBack.bmp
diff --git a/rosapps/imagesoft/res/icons/hist/HistDelete.bmp b/rosapps/applications/imagesoft/res/icons/hist/HistDelete.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/hist/HistDelete.bmp
rename to rosapps/applications/imagesoft/res/icons/hist/HistDelete.bmp
diff --git a/rosapps/imagesoft/res/icons/hist/HistForward.bmp b/rosapps/applications/imagesoft/res/icons/hist/HistForward.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/hist/HistForward.bmp
rename to rosapps/applications/imagesoft/res/icons/hist/HistForward.bmp
diff --git a/rosapps/imagesoft/res/icons/hist/HistRedo.bmp b/rosapps/applications/imagesoft/res/icons/hist/HistRedo.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/hist/HistRedo.bmp
rename to rosapps/applications/imagesoft/res/icons/hist/HistRedo.bmp
diff --git a/rosapps/imagesoft/res/icons/hist/HistUndo.bmp b/rosapps/applications/imagesoft/res/icons/hist/HistUndo.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/hist/HistUndo.bmp
rename to rosapps/applications/imagesoft/res/icons/hist/HistUndo.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainCopyIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainCopyIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainCopyIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainCopyIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainCutIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainCutIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainCutIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainCutIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainNewIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainNewIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainNewIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainNewIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainOpenIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainOpenIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainOpenIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainOpenIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainPasteIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainPasteIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainPasteIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainPasteIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainPrintIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainPrintIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainPrintIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainPrintIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainPrintPreIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainPrintPreIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainPrintPreIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainRedoIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainRedoIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainRedoIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainRedoIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainSaveIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainSaveIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainSaveIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainSaveIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/std/MainUndoIcon.bmp b/rosapps/applications/imagesoft/res/icons/std/MainUndoIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/std/MainUndoIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/std/MainUndoIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/text/TextAlignCenterIcon.bmp b/rosapps/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/text/TextAlignCenterIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/text/TextAlignCenterIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/text/TextAlignLeftIcon.bmp b/rosapps/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/text/TextAlignLeftIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/text/TextAlignLeftIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/text/TextAlignRightIcon.bmp b/rosapps/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/text/TextAlignRightIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/text/TextAlignRightIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/text/TextBoldIcon.bmp b/rosapps/applications/imagesoft/res/icons/text/TextBoldIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/text/TextBoldIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/text/TextBoldIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/text/TextItalicIcon.bmp b/rosapps/applications/imagesoft/res/icons/text/TextItalicIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/text/TextItalicIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/text/TextItalicIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/text/TextUnderlineIcon.bmp b/rosapps/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/text/TextUnderlineIcon.bmp
rename to rosapps/applications/imagesoft/res/icons/text/TextUnderlineIcon.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsCloneStamp.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsCloneStamp.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsCloneStamp.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsColorPicker.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsColorPicker.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsColorPicker.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsEllipse.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsEllipse.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsEllipse.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsEllipseSelect.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsEraser.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsEraser.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsEraser.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsEraser.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsFreeformShape.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsFreeformShape.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsFreeformShape.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsLassoSelect.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsLassoSelect.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsLassoSelect.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsLine.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsLine.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsLine.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsLine.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsMagicWand.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsMagicWand.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsMagicWand.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsMove.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsMove.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsMove.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsMove.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsMoveSelection.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsMoveSelection.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsMoveSelection.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsPaintBrush.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsPaintBrush.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsPaintBrush.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsPaintBucket.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsPaintBucket.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsPaintBucket.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsPencil.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsPencil.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsPencil.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsPencil.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsRecoloring.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsRecoloring.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsRecoloring.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsRectangle.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsRectangle.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsRectangle.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsRectangleSelect.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsRoundedRectangle.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsText.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsText.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsText.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsText.bmp
diff --git a/rosapps/imagesoft/res/icons/tools/ToolsZoom.bmp b/rosapps/applications/imagesoft/res/icons/tools/ToolsZoom.bmp
similarity index 100%
rename from rosapps/imagesoft/res/icons/tools/ToolsZoom.bmp
rename to rosapps/applications/imagesoft/res/icons/tools/ToolsZoom.bmp
diff --git a/rosapps/imagesoft/res/imagesoft.ico b/rosapps/applications/imagesoft/res/imagesoft.ico
similarity index 100%
rename from rosapps/imagesoft/res/imagesoft.ico
rename to rosapps/applications/imagesoft/res/imagesoft.ico
diff --git a/rosapps/imagesoft/resource.h b/rosapps/applications/imagesoft/resource.h
similarity index 100%
rename from rosapps/imagesoft/resource.h
rename to rosapps/applications/imagesoft/resource.h
diff --git a/rosapps/imagesoft/rsrc.rc b/rosapps/applications/imagesoft/rsrc.rc
similarity index 100%
rename from rosapps/imagesoft/rsrc.rc
rename to rosapps/applications/imagesoft/rsrc.rc
diff --git a/rosapps/imagesoft/tooldock.c b/rosapps/applications/imagesoft/tooldock.c
similarity index 100%
rename from rosapps/imagesoft/tooldock.c
rename to rosapps/applications/imagesoft/tooldock.c
diff --git a/rosapps/imagesoft/tooldock.h b/rosapps/applications/imagesoft/tooldock.h
similarity index 100%
rename from rosapps/imagesoft/tooldock.h
rename to rosapps/applications/imagesoft/tooldock.h
diff --git a/rosapps/logevent/logevent.c b/rosapps/applications/logevent/logevent.c
similarity index 100%
rename from rosapps/logevent/logevent.c
rename to rosapps/applications/logevent/logevent.c
diff --git a/rosapps/logevent/logevent.rbuild b/rosapps/applications/logevent/logevent.rbuild
similarity index 100%
rename from rosapps/logevent/logevent.rbuild
rename to rosapps/applications/logevent/logevent.rbuild
diff --git a/rosapps/logevent/logevent.rc b/rosapps/applications/logevent/logevent.rc
similarity index 100%
rename from rosapps/logevent/logevent.rc
rename to rosapps/applications/logevent/logevent.rc
diff --git a/rosapps/magnify/lang/bg-BG.rc b/rosapps/applications/magnify/lang/bg-BG.rc
similarity index 100%
rename from rosapps/magnify/lang/bg-BG.rc
rename to rosapps/applications/magnify/lang/bg-BG.rc
diff --git a/rosapps/magnify/lang/de-DE.rc b/rosapps/applications/magnify/lang/de-DE.rc
similarity index 100%
rename from rosapps/magnify/lang/de-DE.rc
rename to rosapps/applications/magnify/lang/de-DE.rc
diff --git a/rosapps/magnify/lang/en-US.rc b/rosapps/applications/magnify/lang/en-US.rc
similarity index 100%
rename from rosapps/magnify/lang/en-US.rc
rename to rosapps/applications/magnify/lang/en-US.rc
diff --git a/rosapps/magnify/lang/es-ES.rc b/rosapps/applications/magnify/lang/es-ES.rc
similarity index 100%
rename from rosapps/magnify/lang/es-ES.rc
rename to rosapps/applications/magnify/lang/es-ES.rc
diff --git a/rosapps/magnify/lang/fr-FR.rc b/rosapps/applications/magnify/lang/fr-FR.rc
similarity index 100%
rename from rosapps/magnify/lang/fr-FR.rc
rename to rosapps/applications/magnify/lang/fr-FR.rc
diff --git a/rosapps/magnify/lang/it-IT.rc b/rosapps/applications/magnify/lang/it-IT.rc
similarity index 100%
rename from rosapps/magnify/lang/it-IT.rc
rename to rosapps/applications/magnify/lang/it-IT.rc
diff --git a/rosapps/magnify/lang/pl-PL.rc b/rosapps/applications/magnify/lang/pl-PL.rc
similarity index 100%
rename from rosapps/magnify/lang/pl-PL.rc
rename to rosapps/applications/magnify/lang/pl-PL.rc
diff --git a/rosapps/magnify/lang/ru-RU.rc b/rosapps/applications/magnify/lang/ru-RU.rc
similarity index 100%
rename from rosapps/magnify/lang/ru-RU.rc
rename to rosapps/applications/magnify/lang/ru-RU.rc
diff --git a/rosapps/magnify/lang/sk-SK.rc b/rosapps/applications/magnify/lang/sk-SK.rc
similarity index 100%
rename from rosapps/magnify/lang/sk-SK.rc
rename to rosapps/applications/magnify/lang/sk-SK.rc
diff --git a/rosapps/magnify/lang/uk-UA.rc b/rosapps/applications/magnify/lang/uk-UA.rc
similarity index 100%
rename from rosapps/magnify/lang/uk-UA.rc
rename to rosapps/applications/magnify/lang/uk-UA.rc
diff --git a/rosapps/magnify/magnifier.c b/rosapps/applications/magnify/magnifier.c
similarity index 100%
rename from rosapps/magnify/magnifier.c
rename to rosapps/applications/magnify/magnifier.c
diff --git a/rosapps/magnify/magnifier.h b/rosapps/applications/magnify/magnifier.h
similarity index 100%
rename from rosapps/magnify/magnifier.h
rename to rosapps/applications/magnify/magnifier.h
diff --git a/rosapps/magnify/magnify.rbuild b/rosapps/applications/magnify/magnify.rbuild
similarity index 100%
rename from rosapps/magnify/magnify.rbuild
rename to rosapps/applications/magnify/magnify.rbuild
diff --git a/rosapps/magnify/magnify.rc b/rosapps/applications/magnify/magnify.rc
similarity index 100%
rename from rosapps/magnify/magnify.rc
rename to rosapps/applications/magnify/magnify.rc
diff --git a/rosapps/magnify/res/magnify.ico b/rosapps/applications/magnify/res/magnify.ico
similarity index 100%
rename from rosapps/magnify/res/magnify.ico
rename to rosapps/applications/magnify/res/magnify.ico
diff --git a/rosapps/magnify/resource.h b/rosapps/applications/magnify/resource.h
similarity index 100%
rename from rosapps/magnify/resource.h
rename to rosapps/applications/magnify/resource.h
diff --git a/rosapps/magnify/rsrc.rc b/rosapps/applications/magnify/rsrc.rc
similarity index 100%
rename from rosapps/magnify/rsrc.rc
rename to rosapps/applications/magnify/rsrc.rc
diff --git a/rosapps/magnify/settings.c b/rosapps/applications/magnify/settings.c
similarity index 100%
rename from rosapps/magnify/settings.c
rename to rosapps/applications/magnify/settings.c
diff --git a/rosapps/mc/Make.common b/rosapps/applications/mc/Make.common
similarity index 100%
rename from rosapps/mc/Make.common
rename to rosapps/applications/mc/Make.common
diff --git a/rosapps/mc/Makefile.PC b/rosapps/applications/mc/Makefile.PC
similarity index 100%
rename from rosapps/mc/Makefile.PC
rename to rosapps/applications/mc/Makefile.PC
diff --git a/rosapps/mc/VERSION b/rosapps/applications/mc/VERSION
similarity index 100%
rename from rosapps/mc/VERSION
rename to rosapps/applications/mc/VERSION
diff --git a/rosapps/mc/about-nls b/rosapps/applications/mc/about-nls
similarity index 100%
rename from rosapps/mc/about-nls
rename to rosapps/applications/mc/about-nls
diff --git a/rosapps/mc/acconfig.h b/rosapps/applications/mc/acconfig.h
similarity index 100%
rename from rosapps/mc/acconfig.h
rename to rosapps/applications/mc/acconfig.h
diff --git a/rosapps/mc/autogen.sh b/rosapps/applications/mc/autogen.sh
similarity index 100%
rename from rosapps/mc/autogen.sh
rename to rosapps/applications/mc/autogen.sh
diff --git a/rosapps/mc/config.cache b/rosapps/applications/mc/config.cache
similarity index 100%
rename from rosapps/mc/config.cache
rename to rosapps/applications/mc/config.cache
diff --git a/rosapps/mc/config.h b/rosapps/applications/mc/config.h
similarity index 100%
rename from rosapps/mc/config.h
rename to rosapps/applications/mc/config.h
diff --git a/rosapps/mc/config.h.in b/rosapps/applications/mc/config.h.in
similarity index 100%
rename from rosapps/mc/config.h.in
rename to rosapps/applications/mc/config.h.in
diff --git a/rosapps/mc/config.status b/rosapps/applications/mc/config.status
similarity index 100%
rename from rosapps/mc/config.status
rename to rosapps/applications/mc/config.status
diff --git a/rosapps/mc/create_vcs b/rosapps/applications/mc/create_vcs
similarity index 100%
rename from rosapps/mc/create_vcs
rename to rosapps/applications/mc/create_vcs
diff --git a/rosapps/mc/doc/faq b/rosapps/applications/mc/doc/faq
similarity index 100%
rename from rosapps/mc/doc/faq
rename to rosapps/applications/mc/doc/faq
diff --git a/rosapps/mc/doc/install b/rosapps/applications/mc/doc/install
similarity index 100%
rename from rosapps/mc/doc/install
rename to rosapps/applications/mc/doc/install
diff --git a/rosapps/mc/doc/install.fast b/rosapps/applications/mc/doc/install.fast
similarity index 100%
rename from rosapps/mc/doc/install.fast
rename to rosapps/applications/mc/doc/install.fast
diff --git a/rosapps/mc/doc/mc.1 b/rosapps/applications/mc/doc/mc.1
similarity index 100%
rename from rosapps/mc/doc/mc.1
rename to rosapps/applications/mc/doc/mc.1
diff --git a/rosapps/mc/doc/mcedit.1 b/rosapps/applications/mc/doc/mcedit.1
similarity index 100%
rename from rosapps/mc/doc/mcedit.1
rename to rosapps/applications/mc/doc/mcedit.1
diff --git a/rosapps/mc/doc/mcserv.8 b/rosapps/applications/mc/doc/mcserv.8
similarity index 100%
rename from rosapps/mc/doc/mcserv.8
rename to rosapps/applications/mc/doc/mcserv.8
diff --git a/rosapps/mc/doc/news b/rosapps/applications/mc/doc/news
similarity index 100%
rename from rosapps/mc/doc/news
rename to rosapps/applications/mc/doc/news
diff --git a/rosapps/mc/doc/readme b/rosapps/applications/mc/doc/readme
similarity index 100%
rename from rosapps/mc/doc/readme
rename to rosapps/applications/mc/doc/readme
diff --git a/rosapps/mc/doc/readme.nt b/rosapps/applications/mc/doc/readme.nt
similarity index 100%
rename from rosapps/mc/doc/readme.nt
rename to rosapps/applications/mc/doc/readme.nt
diff --git a/rosapps/mc/edit/edit.c b/rosapps/applications/mc/edit/edit.c
similarity index 100%
rename from rosapps/mc/edit/edit.c
rename to rosapps/applications/mc/edit/edit.c
diff --git a/rosapps/mc/edit/edit.h b/rosapps/applications/mc/edit/edit.h
similarity index 100%
rename from rosapps/mc/edit/edit.h
rename to rosapps/applications/mc/edit/edit.h
diff --git a/rosapps/mc/edit/edit_key_translator.c b/rosapps/applications/mc/edit/edit_key_translator.c
similarity index 100%
rename from rosapps/mc/edit/edit_key_translator.c
rename to rosapps/applications/mc/edit/edit_key_translator.c
diff --git a/rosapps/mc/edit/editcmd.c b/rosapps/applications/mc/edit/editcmd.c
similarity index 100%
rename from rosapps/mc/edit/editcmd.c
rename to rosapps/applications/mc/edit/editcmd.c
diff --git a/rosapps/mc/edit/editcmddef.h b/rosapps/applications/mc/edit/editcmddef.h
similarity index 100%
rename from rosapps/mc/edit/editcmddef.h
rename to rosapps/applications/mc/edit/editcmddef.h
diff --git a/rosapps/mc/edit/editdraw.c b/rosapps/applications/mc/edit/editdraw.c
similarity index 100%
rename from rosapps/mc/edit/editdraw.c
rename to rosapps/applications/mc/edit/editdraw.c
diff --git a/rosapps/mc/edit/editmenu.c b/rosapps/applications/mc/edit/editmenu.c
similarity index 100%
rename from rosapps/mc/edit/editmenu.c
rename to rosapps/applications/mc/edit/editmenu.c
diff --git a/rosapps/mc/edit/editoptions.c b/rosapps/applications/mc/edit/editoptions.c
similarity index 100%
rename from rosapps/mc/edit/editoptions.c
rename to rosapps/applications/mc/edit/editoptions.c
diff --git a/rosapps/mc/edit/editwidget.c b/rosapps/applications/mc/edit/editwidget.c
similarity index 100%
rename from rosapps/mc/edit/editwidget.c
rename to rosapps/applications/mc/edit/editwidget.c
diff --git a/rosapps/mc/edit/makefile.in b/rosapps/applications/mc/edit/makefile.in
similarity index 100%
rename from rosapps/mc/edit/makefile.in
rename to rosapps/applications/mc/edit/makefile.in
diff --git a/rosapps/mc/edit/readme.edit b/rosapps/applications/mc/edit/readme.edit
similarity index 100%
rename from rosapps/mc/edit/readme.edit
rename to rosapps/applications/mc/edit/readme.edit
diff --git a/rosapps/mc/edit/syntax.c b/rosapps/applications/mc/edit/syntax.c
similarity index 100%
rename from rosapps/mc/edit/syntax.c
rename to rosapps/applications/mc/edit/syntax.c
diff --git a/rosapps/mc/edit/wordproc.c b/rosapps/applications/mc/edit/wordproc.c
similarity index 100%
rename from rosapps/mc/edit/wordproc.c
rename to rosapps/applications/mc/edit/wordproc.c
diff --git a/rosapps/mc/install-sh b/rosapps/applications/mc/install-sh
similarity index 100%
rename from rosapps/mc/install-sh
rename to rosapps/applications/mc/install-sh
diff --git a/rosapps/mc/make.common.in b/rosapps/applications/mc/make.common.in
similarity index 100%
rename from rosapps/mc/make.common.in
rename to rosapps/applications/mc/make.common.in
diff --git a/rosapps/mc/mc.rbuild b/rosapps/applications/mc/mc.rbuild
similarity index 100%
rename from rosapps/mc/mc.rbuild
rename to rosapps/applications/mc/mc.rbuild
diff --git a/rosapps/mc/mc.rc b/rosapps/applications/mc/mc.rc
similarity index 100%
rename from rosapps/mc/mc.rc
rename to rosapps/applications/mc/mc.rc
diff --git a/rosapps/mc/mcfn_install b/rosapps/applications/mc/mcfn_install
similarity index 100%
rename from rosapps/mc/mcfn_install
rename to rosapps/applications/mc/mcfn_install
diff --git a/rosapps/mc/mcfn_install.in b/rosapps/applications/mc/mcfn_install.in
similarity index 100%
rename from rosapps/mc/mcfn_install.in
rename to rosapps/applications/mc/mcfn_install.in
diff --git a/rosapps/mc/mkinstalldirs b/rosapps/applications/mc/mkinstalldirs
similarity index 91%
rename from rosapps/mc/mkinstalldirs
rename to rosapps/applications/mc/mkinstalldirs
index f140f01d83b..d0fd194fd6c 100644
--- a/rosapps/mc/mkinstalldirs
+++ b/rosapps/applications/mc/mkinstalldirs
@@ -4,7 +4,7 @@
 # Created: 1993-05-16
 # Public domain
 
-# $Id: mkinstalldirs,v 1.1 2001/12/30 09:49:36 sedwards Exp $
+# $Id$
 
 errstatus=0
 
diff --git a/rosapps/mc/pc/Makefile.PC b/rosapps/applications/mc/pc/Makefile.PC
similarity index 100%
rename from rosapps/mc/pc/Makefile.PC
rename to rosapps/applications/mc/pc/Makefile.PC
diff --git a/rosapps/mc/pc/bugs b/rosapps/applications/mc/pc/bugs
similarity index 100%
rename from rosapps/mc/pc/bugs
rename to rosapps/applications/mc/pc/bugs
diff --git a/rosapps/mc/pc/changelog b/rosapps/applications/mc/pc/changelog
similarity index 100%
rename from rosapps/mc/pc/changelog
rename to rosapps/applications/mc/pc/changelog
diff --git a/rosapps/mc/pc/chmod.c b/rosapps/applications/mc/pc/chmod.c
similarity index 100%
rename from rosapps/mc/pc/chmod.c
rename to rosapps/applications/mc/pc/chmod.c
diff --git a/rosapps/mc/pc/config.h b/rosapps/applications/mc/pc/config.h
similarity index 100%
rename from rosapps/mc/pc/config.h
rename to rosapps/applications/mc/pc/config.h
diff --git a/rosapps/mc/pc/cons_nt.c b/rosapps/applications/mc/pc/cons_nt.c
similarity index 100%
rename from rosapps/mc/pc/cons_nt.c
rename to rosapps/applications/mc/pc/cons_nt.c
diff --git a/rosapps/mc/pc/cons_os2.c b/rosapps/applications/mc/pc/cons_os2.c
similarity index 100%
rename from rosapps/mc/pc/cons_os2.c
rename to rosapps/applications/mc/pc/cons_os2.c
diff --git a/rosapps/mc/pc/dirent.h b/rosapps/applications/mc/pc/dirent.h
similarity index 100%
rename from rosapps/mc/pc/dirent.h
rename to rosapps/applications/mc/pc/dirent.h
diff --git a/rosapps/mc/pc/dirent_nt.c b/rosapps/applications/mc/pc/dirent_nt.c
similarity index 100%
rename from rosapps/mc/pc/dirent_nt.c
rename to rosapps/applications/mc/pc/dirent_nt.c
diff --git a/rosapps/mc/pc/dirent_os2.c b/rosapps/applications/mc/pc/dirent_os2.c
similarity index 100%
rename from rosapps/mc/pc/dirent_os2.c
rename to rosapps/applications/mc/pc/dirent_os2.c
diff --git a/rosapps/mc/pc/drive.c b/rosapps/applications/mc/pc/drive.c
similarity index 100%
rename from rosapps/mc/pc/drive.c
rename to rosapps/applications/mc/pc/drive.c
diff --git a/rosapps/mc/pc/drive.h b/rosapps/applications/mc/pc/drive.h
similarity index 100%
rename from rosapps/mc/pc/drive.h
rename to rosapps/applications/mc/pc/drive.h
diff --git a/rosapps/mc/pc/key_nt.c b/rosapps/applications/mc/pc/key_nt.c
similarity index 100%
rename from rosapps/mc/pc/key_nt.c
rename to rosapps/applications/mc/pc/key_nt.c
diff --git a/rosapps/mc/pc/key_os2.c b/rosapps/applications/mc/pc/key_os2.c
similarity index 100%
rename from rosapps/mc/pc/key_os2.c
rename to rosapps/applications/mc/pc/key_os2.c
diff --git a/rosapps/mc/pc/mc.rc b/rosapps/applications/mc/pc/mc.rc
similarity index 100%
rename from rosapps/mc/pc/mc.rc
rename to rosapps/applications/mc/pc/mc.rc
diff --git a/rosapps/mc/pc/readme b/rosapps/applications/mc/pc/readme
similarity index 100%
rename from rosapps/mc/pc/readme
rename to rosapps/applications/mc/pc/readme
diff --git a/rosapps/mc/pc/slint_pc.c b/rosapps/applications/mc/pc/slint_pc.c
similarity index 100%
rename from rosapps/mc/pc/slint_pc.c
rename to rosapps/applications/mc/pc/slint_pc.c
diff --git a/rosapps/mc/pc/sys/param.h b/rosapps/applications/mc/pc/sys/param.h
similarity index 100%
rename from rosapps/mc/pc/sys/param.h
rename to rosapps/applications/mc/pc/sys/param.h
diff --git a/rosapps/mc/pc/sys/time.h___ b/rosapps/applications/mc/pc/sys/time.h___
similarity index 100%
rename from rosapps/mc/pc/sys/time.h___
rename to rosapps/applications/mc/pc/sys/time.h___
diff --git a/rosapps/mc/pc/todo b/rosapps/applications/mc/pc/todo
similarity index 100%
rename from rosapps/mc/pc/todo
rename to rosapps/applications/mc/pc/todo
diff --git a/rosapps/mc/pc/trace_nt.c b/rosapps/applications/mc/pc/trace_nt.c
similarity index 100%
rename from rosapps/mc/pc/trace_nt.c
rename to rosapps/applications/mc/pc/trace_nt.c
diff --git a/rosapps/mc/pc/trace_nt.h b/rosapps/applications/mc/pc/trace_nt.h
similarity index 100%
rename from rosapps/mc/pc/trace_nt.h
rename to rosapps/applications/mc/pc/trace_nt.h
diff --git a/rosapps/mc/pc/util_nt.c b/rosapps/applications/mc/pc/util_nt.c
similarity index 100%
rename from rosapps/mc/pc/util_nt.c
rename to rosapps/applications/mc/pc/util_nt.c
diff --git a/rosapps/mc/pc/util_os2.c b/rosapps/applications/mc/pc/util_os2.c
similarity index 100%
rename from rosapps/mc/pc/util_os2.c
rename to rosapps/applications/mc/pc/util_os2.c
diff --git a/rosapps/mc/pc/util_win32.c b/rosapps/applications/mc/pc/util_win32.c
similarity index 100%
rename from rosapps/mc/pc/util_win32.c
rename to rosapps/applications/mc/pc/util_win32.c
diff --git a/rosapps/mc/pc/util_win32.h b/rosapps/applications/mc/pc/util_win32.h
similarity index 100%
rename from rosapps/mc/pc/util_win32.h
rename to rosapps/applications/mc/pc/util_win32.h
diff --git a/rosapps/mc/pc/util_winnt.c b/rosapps/applications/mc/pc/util_winnt.c
similarity index 100%
rename from rosapps/mc/pc/util_winnt.c
rename to rosapps/applications/mc/pc/util_winnt.c
diff --git a/rosapps/mc/pc/utime.h b/rosapps/applications/mc/pc/utime.h
similarity index 100%
rename from rosapps/mc/pc/utime.h
rename to rosapps/applications/mc/pc/utime.h
diff --git a/rosapps/mc/slang/_slang.h b/rosapps/applications/mc/slang/_slang.h
similarity index 100%
rename from rosapps/mc/slang/_slang.h
rename to rosapps/applications/mc/slang/_slang.h
diff --git a/rosapps/mc/slang/jdmacros.h b/rosapps/applications/mc/slang/jdmacros.h
similarity index 100%
rename from rosapps/mc/slang/jdmacros.h
rename to rosapps/applications/mc/slang/jdmacros.h
diff --git a/rosapps/mc/slang/makefile.in b/rosapps/applications/mc/slang/makefile.in
similarity index 100%
rename from rosapps/mc/slang/makefile.in
rename to rosapps/applications/mc/slang/makefile.in
diff --git a/rosapps/mc/slang/readme b/rosapps/applications/mc/slang/readme
similarity index 100%
rename from rosapps/mc/slang/readme
rename to rosapps/applications/mc/slang/readme
diff --git a/rosapps/mc/slang/sl-feat.h b/rosapps/applications/mc/slang/sl-feat.h
similarity index 100%
rename from rosapps/mc/slang/sl-feat.h
rename to rosapps/applications/mc/slang/sl-feat.h
diff --git a/rosapps/mc/slang/slang.h b/rosapps/applications/mc/slang/slang.h
similarity index 100%
rename from rosapps/mc/slang/slang.h
rename to rosapps/applications/mc/slang/slang.h
diff --git a/rosapps/mc/slang/sldisply.c b/rosapps/applications/mc/slang/sldisply.c
similarity index 100%
rename from rosapps/mc/slang/sldisply.c
rename to rosapps/applications/mc/slang/sldisply.c
diff --git a/rosapps/mc/slang/slerr.c b/rosapps/applications/mc/slang/slerr.c
similarity index 100%
rename from rosapps/mc/slang/slerr.c
rename to rosapps/applications/mc/slang/slerr.c
diff --git a/rosapps/mc/slang/slgetkey.c b/rosapps/applications/mc/slang/slgetkey.c
similarity index 100%
rename from rosapps/mc/slang/slgetkey.c
rename to rosapps/applications/mc/slang/slgetkey.c
diff --git a/rosapps/mc/slang/slmemcpy.c b/rosapps/applications/mc/slang/slmemcpy.c
similarity index 100%
rename from rosapps/mc/slang/slmemcpy.c
rename to rosapps/applications/mc/slang/slmemcpy.c
diff --git a/rosapps/mc/slang/slmemset.c b/rosapps/applications/mc/slang/slmemset.c
similarity index 100%
rename from rosapps/mc/slang/slmemset.c
rename to rosapps/applications/mc/slang/slmemset.c
diff --git a/rosapps/mc/slang/slos2tty.c b/rosapps/applications/mc/slang/slos2tty.c
similarity index 100%
rename from rosapps/mc/slang/slos2tty.c
rename to rosapps/applications/mc/slang/slos2tty.c
diff --git a/rosapps/mc/slang/slsignal.c b/rosapps/applications/mc/slang/slsignal.c
similarity index 100%
rename from rosapps/mc/slang/slsignal.c
rename to rosapps/applications/mc/slang/slsignal.c
diff --git a/rosapps/mc/slang/slsmg.c b/rosapps/applications/mc/slang/slsmg.c
similarity index 100%
rename from rosapps/mc/slang/slsmg.c
rename to rosapps/applications/mc/slang/slsmg.c
diff --git a/rosapps/mc/slang/sltermin.c b/rosapps/applications/mc/slang/sltermin.c
similarity index 100%
rename from rosapps/mc/slang/sltermin.c
rename to rosapps/applications/mc/slang/sltermin.c
diff --git a/rosapps/mc/slang/sltoken.c b/rosapps/applications/mc/slang/sltoken.c
similarity index 100%
rename from rosapps/mc/slang/sltoken.c
rename to rosapps/applications/mc/slang/sltoken.c
diff --git a/rosapps/mc/slang/slutty.c b/rosapps/applications/mc/slang/slutty.c
similarity index 100%
rename from rosapps/mc/slang/slutty.c
rename to rosapps/applications/mc/slang/slutty.c
diff --git a/rosapps/mc/slang/slvideo.c b/rosapps/applications/mc/slang/slvideo.c
similarity index 100%
rename from rosapps/mc/slang/slvideo.c
rename to rosapps/applications/mc/slang/slvideo.c
diff --git a/rosapps/mc/slang/slw32tty.c b/rosapps/applications/mc/slang/slw32tty.c
similarity index 100%
rename from rosapps/mc/slang/slw32tty.c
rename to rosapps/applications/mc/slang/slw32tty.c
diff --git a/rosapps/mc/src/achown.c b/rosapps/applications/mc/src/achown.c
similarity index 100%
rename from rosapps/mc/src/achown.c
rename to rosapps/applications/mc/src/achown.c
diff --git a/rosapps/mc/src/achown.h b/rosapps/applications/mc/src/achown.h
similarity index 100%
rename from rosapps/mc/src/achown.h
rename to rosapps/applications/mc/src/achown.h
diff --git a/rosapps/mc/src/background.c b/rosapps/applications/mc/src/background.c
similarity index 100%
rename from rosapps/mc/src/background.c
rename to rosapps/applications/mc/src/background.c
diff --git a/rosapps/mc/src/background.h b/rosapps/applications/mc/src/background.h
similarity index 100%
rename from rosapps/mc/src/background.h
rename to rosapps/applications/mc/src/background.h
diff --git a/rosapps/mc/src/boxes.c b/rosapps/applications/mc/src/boxes.c
similarity index 100%
rename from rosapps/mc/src/boxes.c
rename to rosapps/applications/mc/src/boxes.c
diff --git a/rosapps/mc/src/boxes.h b/rosapps/applications/mc/src/boxes.h
similarity index 100%
rename from rosapps/mc/src/boxes.h
rename to rosapps/applications/mc/src/boxes.h
diff --git a/rosapps/mc/src/changelog b/rosapps/applications/mc/src/changelog
similarity index 100%
rename from rosapps/mc/src/changelog
rename to rosapps/applications/mc/src/changelog
diff --git a/rosapps/mc/src/chmod.c b/rosapps/applications/mc/src/chmod.c
similarity index 100%
rename from rosapps/mc/src/chmod.c
rename to rosapps/applications/mc/src/chmod.c
diff --git a/rosapps/mc/src/chmod.h b/rosapps/applications/mc/src/chmod.h
similarity index 100%
rename from rosapps/mc/src/chmod.h
rename to rosapps/applications/mc/src/chmod.h
diff --git a/rosapps/mc/src/chown.c b/rosapps/applications/mc/src/chown.c
similarity index 100%
rename from rosapps/mc/src/chown.c
rename to rosapps/applications/mc/src/chown.c
diff --git a/rosapps/mc/src/chown.h b/rosapps/applications/mc/src/chown.h
similarity index 100%
rename from rosapps/mc/src/chown.h
rename to rosapps/applications/mc/src/chown.h
diff --git a/rosapps/mc/src/cmd.c b/rosapps/applications/mc/src/cmd.c
similarity index 100%
rename from rosapps/mc/src/cmd.c
rename to rosapps/applications/mc/src/cmd.c
diff --git a/rosapps/mc/src/cmd.h b/rosapps/applications/mc/src/cmd.h
similarity index 100%
rename from rosapps/mc/src/cmd.h
rename to rosapps/applications/mc/src/cmd.h
diff --git a/rosapps/mc/src/color.c b/rosapps/applications/mc/src/color.c
similarity index 100%
rename from rosapps/mc/src/color.c
rename to rosapps/applications/mc/src/color.c
diff --git a/rosapps/mc/src/color.h b/rosapps/applications/mc/src/color.h
similarity index 100%
rename from rosapps/mc/src/color.h
rename to rosapps/applications/mc/src/color.h
diff --git a/rosapps/mc/src/command.c b/rosapps/applications/mc/src/command.c
similarity index 100%
rename from rosapps/mc/src/command.c
rename to rosapps/applications/mc/src/command.c
diff --git a/rosapps/mc/src/command.h b/rosapps/applications/mc/src/command.h
similarity index 100%
rename from rosapps/mc/src/command.h
rename to rosapps/applications/mc/src/command.h
diff --git a/rosapps/mc/src/complete.c b/rosapps/applications/mc/src/complete.c
similarity index 100%
rename from rosapps/mc/src/complete.c
rename to rosapps/applications/mc/src/complete.c
diff --git a/rosapps/mc/src/complete.h b/rosapps/applications/mc/src/complete.h
similarity index 100%
rename from rosapps/mc/src/complete.h
rename to rosapps/applications/mc/src/complete.h
diff --git a/rosapps/mc/src/cons.handler.c b/rosapps/applications/mc/src/cons.handler.c
similarity index 100%
rename from rosapps/mc/src/cons.handler.c
rename to rosapps/applications/mc/src/cons.handler.c
diff --git a/rosapps/mc/src/cons.saver.c b/rosapps/applications/mc/src/cons.saver.c
similarity index 100%
rename from rosapps/mc/src/cons.saver.c
rename to rosapps/applications/mc/src/cons.saver.c
diff --git a/rosapps/mc/src/cons.saver.h b/rosapps/applications/mc/src/cons.saver.h
similarity index 100%
rename from rosapps/mc/src/cons.saver.h
rename to rosapps/applications/mc/src/cons.saver.h
diff --git a/rosapps/mc/src/depend.awk b/rosapps/applications/mc/src/depend.awk
similarity index 100%
rename from rosapps/mc/src/depend.awk
rename to rosapps/applications/mc/src/depend.awk
diff --git a/rosapps/mc/src/dialog.c b/rosapps/applications/mc/src/dialog.c
similarity index 100%
rename from rosapps/mc/src/dialog.c
rename to rosapps/applications/mc/src/dialog.c
diff --git a/rosapps/mc/src/dialog.h b/rosapps/applications/mc/src/dialog.h
similarity index 100%
rename from rosapps/mc/src/dialog.h
rename to rosapps/applications/mc/src/dialog.h
diff --git a/rosapps/mc/src/dir.c b/rosapps/applications/mc/src/dir.c
similarity index 100%
rename from rosapps/mc/src/dir.c
rename to rosapps/applications/mc/src/dir.c
diff --git a/rosapps/mc/src/dir.h b/rosapps/applications/mc/src/dir.h
similarity index 100%
rename from rosapps/mc/src/dir.h
rename to rosapps/applications/mc/src/dir.h
diff --git a/rosapps/mc/src/dlg.c b/rosapps/applications/mc/src/dlg.c
similarity index 100%
rename from rosapps/mc/src/dlg.c
rename to rosapps/applications/mc/src/dlg.c
diff --git a/rosapps/mc/src/dlg.h b/rosapps/applications/mc/src/dlg.h
similarity index 100%
rename from rosapps/mc/src/dlg.h
rename to rosapps/applications/mc/src/dlg.h
diff --git a/rosapps/mc/src/ext.c b/rosapps/applications/mc/src/ext.c
similarity index 100%
rename from rosapps/mc/src/ext.c
rename to rosapps/applications/mc/src/ext.c
diff --git a/rosapps/mc/src/ext.h b/rosapps/applications/mc/src/ext.h
similarity index 100%
rename from rosapps/mc/src/ext.h
rename to rosapps/applications/mc/src/ext.h
diff --git a/rosapps/mc/src/features.inc b/rosapps/applications/mc/src/features.inc
similarity index 100%
rename from rosapps/mc/src/features.inc
rename to rosapps/applications/mc/src/features.inc
diff --git a/rosapps/mc/src/file.c b/rosapps/applications/mc/src/file.c
similarity index 100%
rename from rosapps/mc/src/file.c
rename to rosapps/applications/mc/src/file.c
diff --git a/rosapps/mc/src/file.h b/rosapps/applications/mc/src/file.h
similarity index 100%
rename from rosapps/mc/src/file.h
rename to rosapps/applications/mc/src/file.h
diff --git a/rosapps/mc/src/find.c b/rosapps/applications/mc/src/find.c
similarity index 100%
rename from rosapps/mc/src/find.c
rename to rosapps/applications/mc/src/find.c
diff --git a/rosapps/mc/src/find.h b/rosapps/applications/mc/src/find.h
similarity index 100%
rename from rosapps/mc/src/find.h
rename to rosapps/applications/mc/src/find.h
diff --git a/rosapps/mc/src/fixhlp.c b/rosapps/applications/mc/src/fixhlp.c
similarity index 100%
rename from rosapps/mc/src/fixhlp.c
rename to rosapps/applications/mc/src/fixhlp.c
diff --git a/rosapps/mc/src/fs.h b/rosapps/applications/mc/src/fs.h
similarity index 100%
rename from rosapps/mc/src/fs.h
rename to rosapps/applications/mc/src/fs.h
diff --git a/rosapps/mc/src/fsusage.c b/rosapps/applications/mc/src/fsusage.c
similarity index 100%
rename from rosapps/mc/src/fsusage.c
rename to rosapps/applications/mc/src/fsusage.c
diff --git a/rosapps/mc/src/fsusage.h b/rosapps/applications/mc/src/fsusage.h
similarity index 100%
rename from rosapps/mc/src/fsusage.h
rename to rosapps/applications/mc/src/fsusage.h
diff --git a/rosapps/mc/src/gindex.pl b/rosapps/applications/mc/src/gindex.pl
similarity index 100%
rename from rosapps/mc/src/gindex.pl
rename to rosapps/applications/mc/src/gindex.pl
diff --git a/rosapps/mc/src/global.h b/rosapps/applications/mc/src/global.h
similarity index 100%
rename from rosapps/mc/src/global.h
rename to rosapps/applications/mc/src/global.h
diff --git a/rosapps/mc/src/help.c b/rosapps/applications/mc/src/help.c
similarity index 100%
rename from rosapps/mc/src/help.c
rename to rosapps/applications/mc/src/help.c
diff --git a/rosapps/mc/src/help.h b/rosapps/applications/mc/src/help.h
similarity index 100%
rename from rosapps/mc/src/help.h
rename to rosapps/applications/mc/src/help.h
diff --git a/rosapps/mc/src/hotlist.c b/rosapps/applications/mc/src/hotlist.c
similarity index 100%
rename from rosapps/mc/src/hotlist.c
rename to rosapps/applications/mc/src/hotlist.c
diff --git a/rosapps/mc/src/hotlist.h b/rosapps/applications/mc/src/hotlist.h
similarity index 100%
rename from rosapps/mc/src/hotlist.h
rename to rosapps/applications/mc/src/hotlist.h
diff --git a/rosapps/mc/src/i18n.h b/rosapps/applications/mc/src/i18n.h
similarity index 100%
rename from rosapps/mc/src/i18n.h
rename to rosapps/applications/mc/src/i18n.h
diff --git a/rosapps/mc/src/info.c b/rosapps/applications/mc/src/info.c
similarity index 100%
rename from rosapps/mc/src/info.c
rename to rosapps/applications/mc/src/info.c
diff --git a/rosapps/mc/src/info.h b/rosapps/applications/mc/src/info.h
similarity index 100%
rename from rosapps/mc/src/info.h
rename to rosapps/applications/mc/src/info.h
diff --git a/rosapps/mc/src/key.c b/rosapps/applications/mc/src/key.c
similarity index 100%
rename from rosapps/mc/src/key.c
rename to rosapps/applications/mc/src/key.c
diff --git a/rosapps/mc/src/key.h b/rosapps/applications/mc/src/key.h
similarity index 100%
rename from rosapps/mc/src/key.h
rename to rosapps/applications/mc/src/key.h
diff --git a/rosapps/mc/src/keyxdef.c b/rosapps/applications/mc/src/keyxdef.c
similarity index 100%
rename from rosapps/mc/src/keyxdef.c
rename to rosapps/applications/mc/src/keyxdef.c
diff --git a/rosapps/mc/src/layout.c b/rosapps/applications/mc/src/layout.c
similarity index 100%
rename from rosapps/mc/src/layout.c
rename to rosapps/applications/mc/src/layout.c
diff --git a/rosapps/mc/src/layout.h b/rosapps/applications/mc/src/layout.h
similarity index 100%
rename from rosapps/mc/src/layout.h
rename to rosapps/applications/mc/src/layout.h
diff --git a/rosapps/mc/src/learn.c b/rosapps/applications/mc/src/learn.c
similarity index 100%
rename from rosapps/mc/src/learn.c
rename to rosapps/applications/mc/src/learn.c
diff --git a/rosapps/mc/src/learn.h b/rosapps/applications/mc/src/learn.h
similarity index 100%
rename from rosapps/mc/src/learn.h
rename to rosapps/applications/mc/src/learn.h
diff --git a/rosapps/mc/src/listmode.c b/rosapps/applications/mc/src/listmode.c
similarity index 100%
rename from rosapps/mc/src/listmode.c
rename to rosapps/applications/mc/src/listmode.c
diff --git a/rosapps/mc/src/listmode.h b/rosapps/applications/mc/src/listmode.h
similarity index 100%
rename from rosapps/mc/src/listmode.h
rename to rosapps/applications/mc/src/listmode.h
diff --git a/rosapps/mc/src/mad.c b/rosapps/applications/mc/src/mad.c
similarity index 100%
rename from rosapps/mc/src/mad.c
rename to rosapps/applications/mc/src/mad.c
diff --git a/rosapps/mc/src/mad.h b/rosapps/applications/mc/src/mad.h
similarity index 100%
rename from rosapps/mc/src/mad.h
rename to rosapps/applications/mc/src/mad.h
diff --git a/rosapps/mc/src/main.c b/rosapps/applications/mc/src/main.c
similarity index 100%
rename from rosapps/mc/src/main.c
rename to rosapps/applications/mc/src/main.c
diff --git a/rosapps/mc/src/main.h b/rosapps/applications/mc/src/main.h
similarity index 100%
rename from rosapps/mc/src/main.h
rename to rosapps/applications/mc/src/main.h
diff --git a/rosapps/mc/src/makefile.in b/rosapps/applications/mc/src/makefile.in
similarity index 100%
rename from rosapps/mc/src/makefile.in
rename to rosapps/applications/mc/src/makefile.in
diff --git a/rosapps/mc/src/man2hlp.c b/rosapps/applications/mc/src/man2hlp.c
similarity index 100%
rename from rosapps/mc/src/man2hlp.c
rename to rosapps/applications/mc/src/man2hlp.c
diff --git a/rosapps/mc/src/mc.hlp b/rosapps/applications/mc/src/mc.hlp
similarity index 100%
rename from rosapps/mc/src/mc.hlp
rename to rosapps/applications/mc/src/mc.hlp
diff --git a/rosapps/mc/src/mem.h b/rosapps/applications/mc/src/mem.h
similarity index 100%
rename from rosapps/mc/src/mem.h
rename to rosapps/applications/mc/src/mem.h
diff --git a/rosapps/mc/src/menu.c b/rosapps/applications/mc/src/menu.c
similarity index 100%
rename from rosapps/mc/src/menu.c
rename to rosapps/applications/mc/src/menu.c
diff --git a/rosapps/mc/src/menu.h b/rosapps/applications/mc/src/menu.h
similarity index 100%
rename from rosapps/mc/src/menu.h
rename to rosapps/applications/mc/src/menu.h
diff --git a/rosapps/mc/src/mfmt.c b/rosapps/applications/mc/src/mfmt.c
similarity index 100%
rename from rosapps/mc/src/mfmt.c
rename to rosapps/applications/mc/src/mfmt.c
diff --git a/rosapps/mc/src/mountlist.c b/rosapps/applications/mc/src/mountlist.c
similarity index 100%
rename from rosapps/mc/src/mountlist.c
rename to rosapps/applications/mc/src/mountlist.c
diff --git a/rosapps/mc/src/mountlist.h b/rosapps/applications/mc/src/mountlist.h
similarity index 100%
rename from rosapps/mc/src/mountlist.h
rename to rosapps/applications/mc/src/mountlist.h
diff --git a/rosapps/mc/src/mouse.c b/rosapps/applications/mc/src/mouse.c
similarity index 100%
rename from rosapps/mc/src/mouse.c
rename to rosapps/applications/mc/src/mouse.c
diff --git a/rosapps/mc/src/mouse.h b/rosapps/applications/mc/src/mouse.h
similarity index 100%
rename from rosapps/mc/src/mouse.h
rename to rosapps/applications/mc/src/mouse.h
diff --git a/rosapps/mc/src/myslang.h b/rosapps/applications/mc/src/myslang.h
similarity index 100%
rename from rosapps/mc/src/myslang.h
rename to rosapps/applications/mc/src/myslang.h
diff --git a/rosapps/mc/src/ncurses.patch b/rosapps/applications/mc/src/ncurses.patch
similarity index 100%
rename from rosapps/mc/src/ncurses.patch
rename to rosapps/applications/mc/src/ncurses.patch
diff --git a/rosapps/mc/src/ochangelog b/rosapps/applications/mc/src/ochangelog
similarity index 100%
rename from rosapps/mc/src/ochangelog
rename to rosapps/applications/mc/src/ochangelog
diff --git a/rosapps/mc/src/option.c b/rosapps/applications/mc/src/option.c
similarity index 100%
rename from rosapps/mc/src/option.c
rename to rosapps/applications/mc/src/option.c
diff --git a/rosapps/mc/src/option.h b/rosapps/applications/mc/src/option.h
similarity index 100%
rename from rosapps/mc/src/option.h
rename to rosapps/applications/mc/src/option.h
diff --git a/rosapps/mc/src/panel.h b/rosapps/applications/mc/src/panel.h
similarity index 100%
rename from rosapps/mc/src/panel.h
rename to rosapps/applications/mc/src/panel.h
diff --git a/rosapps/mc/src/panelize.c b/rosapps/applications/mc/src/panelize.c
similarity index 100%
rename from rosapps/mc/src/panelize.c
rename to rosapps/applications/mc/src/panelize.c
diff --git a/rosapps/mc/src/panelize.h b/rosapps/applications/mc/src/panelize.h
similarity index 100%
rename from rosapps/mc/src/panelize.h
rename to rosapps/applications/mc/src/panelize.h
diff --git a/rosapps/mc/src/popt.c b/rosapps/applications/mc/src/popt.c
similarity index 100%
rename from rosapps/mc/src/popt.c
rename to rosapps/applications/mc/src/popt.c
diff --git a/rosapps/mc/src/popt.h b/rosapps/applications/mc/src/popt.h
similarity index 100%
rename from rosapps/mc/src/popt.h
rename to rosapps/applications/mc/src/popt.h
diff --git a/rosapps/mc/src/profile.c b/rosapps/applications/mc/src/profile.c
similarity index 100%
rename from rosapps/mc/src/profile.c
rename to rosapps/applications/mc/src/profile.c
diff --git a/rosapps/mc/src/profile.h b/rosapps/applications/mc/src/profile.h
similarity index 100%
rename from rosapps/mc/src/profile.h
rename to rosapps/applications/mc/src/profile.h
diff --git a/rosapps/mc/src/regex.c b/rosapps/applications/mc/src/regex.c
similarity index 100%
rename from rosapps/mc/src/regex.c
rename to rosapps/applications/mc/src/regex.c
diff --git a/rosapps/mc/src/regex.h b/rosapps/applications/mc/src/regex.h
similarity index 100%
rename from rosapps/mc/src/regex.h
rename to rosapps/applications/mc/src/regex.h
diff --git a/rosapps/mc/src/rxvt.c b/rosapps/applications/mc/src/rxvt.c
similarity index 100%
rename from rosapps/mc/src/rxvt.c
rename to rosapps/applications/mc/src/rxvt.c
diff --git a/rosapps/mc/src/screen.c b/rosapps/applications/mc/src/screen.c
similarity index 100%
rename from rosapps/mc/src/screen.c
rename to rosapps/applications/mc/src/screen.c
diff --git a/rosapps/mc/src/setup.c b/rosapps/applications/mc/src/setup.c
similarity index 100%
rename from rosapps/mc/src/setup.c
rename to rosapps/applications/mc/src/setup.c
diff --git a/rosapps/mc/src/setup.h b/rosapps/applications/mc/src/setup.h
similarity index 100%
rename from rosapps/mc/src/setup.h
rename to rosapps/applications/mc/src/setup.h
diff --git a/rosapps/mc/src/slint.c b/rosapps/applications/mc/src/slint.c
similarity index 100%
rename from rosapps/mc/src/slint.c
rename to rosapps/applications/mc/src/slint.c
diff --git a/rosapps/mc/src/subshell.c b/rosapps/applications/mc/src/subshell.c
similarity index 100%
rename from rosapps/mc/src/subshell.c
rename to rosapps/applications/mc/src/subshell.c
diff --git a/rosapps/mc/src/subshell.h b/rosapps/applications/mc/src/subshell.h
similarity index 100%
rename from rosapps/mc/src/subshell.h
rename to rosapps/applications/mc/src/subshell.h
diff --git a/rosapps/mc/src/terms.c b/rosapps/applications/mc/src/terms.c
similarity index 100%
rename from rosapps/mc/src/terms.c
rename to rosapps/applications/mc/src/terms.c
diff --git a/rosapps/mc/src/text.c b/rosapps/applications/mc/src/text.c
similarity index 100%
rename from rosapps/mc/src/text.c
rename to rosapps/applications/mc/src/text.c
diff --git a/rosapps/mc/src/textconf.h b/rosapps/applications/mc/src/textconf.h
similarity index 100%
rename from rosapps/mc/src/textconf.h
rename to rosapps/applications/mc/src/textconf.h
diff --git a/rosapps/mc/src/todo b/rosapps/applications/mc/src/todo
similarity index 100%
rename from rosapps/mc/src/todo
rename to rosapps/applications/mc/src/todo
diff --git a/rosapps/mc/src/tree.c b/rosapps/applications/mc/src/tree.c
similarity index 100%
rename from rosapps/mc/src/tree.c
rename to rosapps/applications/mc/src/tree.c
diff --git a/rosapps/mc/src/tree.h b/rosapps/applications/mc/src/tree.h
similarity index 100%
rename from rosapps/mc/src/tree.h
rename to rosapps/applications/mc/src/tree.h
diff --git a/rosapps/mc/src/tty.h b/rosapps/applications/mc/src/tty.h
similarity index 100%
rename from rosapps/mc/src/tty.h
rename to rosapps/applications/mc/src/tty.h
diff --git a/rosapps/mc/src/user.c b/rosapps/applications/mc/src/user.c
similarity index 100%
rename from rosapps/mc/src/user.c
rename to rosapps/applications/mc/src/user.c
diff --git a/rosapps/mc/src/user.h b/rosapps/applications/mc/src/user.h
similarity index 100%
rename from rosapps/mc/src/user.h
rename to rosapps/applications/mc/src/user.h
diff --git a/rosapps/mc/src/util.c b/rosapps/applications/mc/src/util.c
similarity index 100%
rename from rosapps/mc/src/util.c
rename to rosapps/applications/mc/src/util.c
diff --git a/rosapps/mc/src/util.h b/rosapps/applications/mc/src/util.h
similarity index 100%
rename from rosapps/mc/src/util.h
rename to rosapps/applications/mc/src/util.h
diff --git a/rosapps/mc/src/utilunix.c b/rosapps/applications/mc/src/utilunix.c
similarity index 100%
rename from rosapps/mc/src/utilunix.c
rename to rosapps/applications/mc/src/utilunix.c
diff --git a/rosapps/mc/src/view.c b/rosapps/applications/mc/src/view.c
similarity index 100%
rename from rosapps/mc/src/view.c
rename to rosapps/applications/mc/src/view.c
diff --git a/rosapps/mc/src/view.h b/rosapps/applications/mc/src/view.h
similarity index 100%
rename from rosapps/mc/src/view.h
rename to rosapps/applications/mc/src/view.h
diff --git a/rosapps/mc/src/widget.c b/rosapps/applications/mc/src/widget.c
similarity index 100%
rename from rosapps/mc/src/widget.c
rename to rosapps/applications/mc/src/widget.c
diff --git a/rosapps/mc/src/widget.h b/rosapps/applications/mc/src/widget.h
similarity index 100%
rename from rosapps/mc/src/widget.h
rename to rosapps/applications/mc/src/widget.h
diff --git a/rosapps/mc/src/win.c b/rosapps/applications/mc/src/win.c
similarity index 100%
rename from rosapps/mc/src/win.c
rename to rosapps/applications/mc/src/win.c
diff --git a/rosapps/mc/src/win.h b/rosapps/applications/mc/src/win.h
similarity index 100%
rename from rosapps/mc/src/win.h
rename to rosapps/applications/mc/src/win.h
diff --git a/rosapps/mc/src/wtools.c b/rosapps/applications/mc/src/wtools.c
similarity index 100%
rename from rosapps/mc/src/wtools.c
rename to rosapps/applications/mc/src/wtools.c
diff --git a/rosapps/mc/src/wtools.h b/rosapps/applications/mc/src/wtools.h
similarity index 100%
rename from rosapps/mc/src/wtools.h
rename to rosapps/applications/mc/src/wtools.h
diff --git a/rosapps/mc/src/x.h b/rosapps/applications/mc/src/x.h
similarity index 100%
rename from rosapps/mc/src/x.h
rename to rosapps/applications/mc/src/x.h
diff --git a/rosapps/mc/src/xcurses.c b/rosapps/applications/mc/src/xcurses.c
similarity index 100%
rename from rosapps/mc/src/xcurses.c
rename to rosapps/applications/mc/src/xcurses.c
diff --git a/rosapps/mc/src/xmkdir b/rosapps/applications/mc/src/xmkdir
similarity index 100%
rename from rosapps/mc/src/xmkdir
rename to rosapps/applications/mc/src/xmkdir
diff --git a/rosapps/mc/src/xslint.c b/rosapps/applications/mc/src/xslint.c
similarity index 100%
rename from rosapps/mc/src/xslint.c
rename to rosapps/applications/mc/src/xslint.c
diff --git a/rosapps/mc/version.in b/rosapps/applications/mc/version.in
similarity index 100%
rename from rosapps/mc/version.in
rename to rosapps/applications/mc/version.in
diff --git a/rosapps/mc/vfs/extfs.h b/rosapps/applications/mc/vfs/extfs.h
similarity index 100%
rename from rosapps/mc/vfs/extfs.h
rename to rosapps/applications/mc/vfs/extfs.h
diff --git a/rosapps/mc/vfs/extfs/cpio b/rosapps/applications/mc/vfs/extfs/cpio
similarity index 100%
rename from rosapps/mc/vfs/extfs/cpio
rename to rosapps/applications/mc/vfs/extfs/cpio
diff --git a/rosapps/mc/vfs/extfs/deb b/rosapps/applications/mc/vfs/extfs/deb
similarity index 100%
rename from rosapps/mc/vfs/extfs/deb
rename to rosapps/applications/mc/vfs/extfs/deb
diff --git a/rosapps/mc/vfs/extfs/ftplist b/rosapps/applications/mc/vfs/extfs/ftplist
similarity index 100%
rename from rosapps/mc/vfs/extfs/ftplist
rename to rosapps/applications/mc/vfs/extfs/ftplist
diff --git a/rosapps/mc/vfs/extfs/lha b/rosapps/applications/mc/vfs/extfs/lha
similarity index 100%
rename from rosapps/mc/vfs/extfs/lha
rename to rosapps/applications/mc/vfs/extfs/lha
diff --git a/rosapps/mc/vfs/extfs/lslR b/rosapps/applications/mc/vfs/extfs/lslR
similarity index 100%
rename from rosapps/mc/vfs/extfs/lslR
rename to rosapps/applications/mc/vfs/extfs/lslR
diff --git a/rosapps/mc/vfs/extfs/rar b/rosapps/applications/mc/vfs/extfs/rar
similarity index 100%
rename from rosapps/mc/vfs/extfs/rar
rename to rosapps/applications/mc/vfs/extfs/rar
diff --git a/rosapps/mc/vfs/extfs/zip b/rosapps/applications/mc/vfs/extfs/zip
similarity index 100%
rename from rosapps/mc/vfs/extfs/zip
rename to rosapps/applications/mc/vfs/extfs/zip
diff --git a/rosapps/mc/vfs/extfs/zoo b/rosapps/applications/mc/vfs/extfs/zoo
similarity index 100%
rename from rosapps/mc/vfs/extfs/zoo
rename to rosapps/applications/mc/vfs/extfs/zoo
diff --git a/rosapps/mc/vfs/vfs.h b/rosapps/applications/mc/vfs/vfs.h
similarity index 100%
rename from rosapps/mc/vfs/vfs.h
rename to rosapps/applications/mc/vfs/vfs.h
diff --git a/rosapps/net/dhcpd/AUTHORS b/rosapps/applications/net/dhcpd/AUTHORS
similarity index 100%
rename from rosapps/net/dhcpd/AUTHORS
rename to rosapps/applications/net/dhcpd/AUTHORS
diff --git a/rosapps/net/dhcpd/COPYING b/rosapps/applications/net/dhcpd/COPYING
similarity index 100%
rename from rosapps/net/dhcpd/COPYING
rename to rosapps/applications/net/dhcpd/COPYING
diff --git a/rosapps/net/dhcpd/ChangeLog b/rosapps/applications/net/dhcpd/ChangeLog
similarity index 100%
rename from rosapps/net/dhcpd/ChangeLog
rename to rosapps/applications/net/dhcpd/ChangeLog
diff --git a/rosapps/net/dhcpd/INSTALL b/rosapps/applications/net/dhcpd/INSTALL
similarity index 100%
rename from rosapps/net/dhcpd/INSTALL
rename to rosapps/applications/net/dhcpd/INSTALL
diff --git a/rosapps/net/dhcpd/Makefile.am b/rosapps/applications/net/dhcpd/Makefile.am
similarity index 100%
rename from rosapps/net/dhcpd/Makefile.am
rename to rosapps/applications/net/dhcpd/Makefile.am
diff --git a/rosapps/net/dhcpd/Makefile.in b/rosapps/applications/net/dhcpd/Makefile.in
similarity index 100%
rename from rosapps/net/dhcpd/Makefile.in
rename to rosapps/applications/net/dhcpd/Makefile.in
diff --git a/rosapps/net/dhcpd/NEWS b/rosapps/applications/net/dhcpd/NEWS
similarity index 100%
rename from rosapps/net/dhcpd/NEWS
rename to rosapps/applications/net/dhcpd/NEWS
diff --git a/rosapps/net/dhcpd/README b/rosapps/applications/net/dhcpd/README
similarity index 100%
rename from rosapps/net/dhcpd/README
rename to rosapps/applications/net/dhcpd/README
diff --git a/rosapps/net/dhcpd/README.ROS b/rosapps/applications/net/dhcpd/README.ROS
similarity index 100%
rename from rosapps/net/dhcpd/README.ROS
rename to rosapps/applications/net/dhcpd/README.ROS
diff --git a/rosapps/net/dhcpd/TODO b/rosapps/applications/net/dhcpd/TODO
similarity index 100%
rename from rosapps/net/dhcpd/TODO
rename to rosapps/applications/net/dhcpd/TODO
diff --git a/rosapps/net/dhcpd/aclocal.m4 b/rosapps/applications/net/dhcpd/aclocal.m4
similarity index 100%
rename from rosapps/net/dhcpd/aclocal.m4
rename to rosapps/applications/net/dhcpd/aclocal.m4
diff --git a/rosapps/net/dhcpd/config.cache b/rosapps/applications/net/dhcpd/config.cache
similarity index 100%
rename from rosapps/net/dhcpd/config.cache
rename to rosapps/applications/net/dhcpd/config.cache
diff --git a/rosapps/net/dhcpd/config.h b/rosapps/applications/net/dhcpd/config.h
similarity index 100%
rename from rosapps/net/dhcpd/config.h
rename to rosapps/applications/net/dhcpd/config.h
diff --git a/rosapps/net/dhcpd/config.h.in b/rosapps/applications/net/dhcpd/config.h.in
similarity index 100%
rename from rosapps/net/dhcpd/config.h.in
rename to rosapps/applications/net/dhcpd/config.h.in
diff --git a/rosapps/net/dhcpd/config.h.top b/rosapps/applications/net/dhcpd/config.h.top
similarity index 100%
rename from rosapps/net/dhcpd/config.h.top
rename to rosapps/applications/net/dhcpd/config.h.top
diff --git a/rosapps/net/dhcpd/config.log b/rosapps/applications/net/dhcpd/config.log
similarity index 100%
rename from rosapps/net/dhcpd/config.log
rename to rosapps/applications/net/dhcpd/config.log
diff --git a/rosapps/net/dhcpd/config.status b/rosapps/applications/net/dhcpd/config.status
similarity index 100%
rename from rosapps/net/dhcpd/config.status
rename to rosapps/applications/net/dhcpd/config.status
diff --git a/rosapps/net/dhcpd/configure b/rosapps/applications/net/dhcpd/configure
similarity index 100%
rename from rosapps/net/dhcpd/configure
rename to rosapps/applications/net/dhcpd/configure
diff --git a/rosapps/net/dhcpd/configure.in b/rosapps/applications/net/dhcpd/configure.in
similarity index 100%
rename from rosapps/net/dhcpd/configure.in
rename to rosapps/applications/net/dhcpd/configure.in
diff --git a/rosapps/net/dhcpd/dhcpd.rc b/rosapps/applications/net/dhcpd/dhcpd.rc
similarity index 100%
rename from rosapps/net/dhcpd/dhcpd.rc
rename to rosapps/applications/net/dhcpd/dhcpd.rc
diff --git a/rosapps/net/dhcpd/install-sh b/rosapps/applications/net/dhcpd/install-sh
similarity index 100%
rename from rosapps/net/dhcpd/install-sh
rename to rosapps/applications/net/dhcpd/install-sh
diff --git a/rosapps/net/dhcpd/missing b/rosapps/applications/net/dhcpd/missing
similarity index 100%
rename from rosapps/net/dhcpd/missing
rename to rosapps/applications/net/dhcpd/missing
diff --git a/rosapps/net/dhcpd/mkinstalldirs b/rosapps/applications/net/dhcpd/mkinstalldirs
similarity index 100%
rename from rosapps/net/dhcpd/mkinstalldirs
rename to rosapps/applications/net/dhcpd/mkinstalldirs
diff --git a/rosapps/net/dhcpd/samples/dhcp.conf b/rosapps/applications/net/dhcpd/samples/dhcp.conf
similarity index 100%
rename from rosapps/net/dhcpd/samples/dhcp.conf
rename to rosapps/applications/net/dhcpd/samples/dhcp.conf
diff --git a/rosapps/net/dhcpd/src/Makefile.am b/rosapps/applications/net/dhcpd/src/Makefile.am
similarity index 100%
rename from rosapps/net/dhcpd/src/Makefile.am
rename to rosapps/applications/net/dhcpd/src/Makefile.am
diff --git a/rosapps/net/dhcpd/src/Makefile.in b/rosapps/applications/net/dhcpd/src/Makefile.in
similarity index 100%
rename from rosapps/net/dhcpd/src/Makefile.in
rename to rosapps/applications/net/dhcpd/src/Makefile.in
diff --git a/rosapps/net/dhcpd/src/dhcp.conf b/rosapps/applications/net/dhcpd/src/dhcp.conf
similarity index 100%
rename from rosapps/net/dhcpd/src/dhcp.conf
rename to rosapps/applications/net/dhcpd/src/dhcp.conf
diff --git a/rosapps/net/dhcpd/src/display/display.c b/rosapps/applications/net/dhcpd/src/display/display.c
similarity index 100%
rename from rosapps/net/dhcpd/src/display/display.c
rename to rosapps/applications/net/dhcpd/src/display/display.c
diff --git a/rosapps/net/dhcpd/src/include/datatypes.h b/rosapps/applications/net/dhcpd/src/include/datatypes.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/datatypes.h
rename to rosapps/applications/net/dhcpd/src/include/datatypes.h
diff --git a/rosapps/net/dhcpd/src/include/display.h b/rosapps/applications/net/dhcpd/src/include/display.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/display.h
rename to rosapps/applications/net/dhcpd/src/include/display.h
diff --git a/rosapps/net/dhcpd/src/include/headers.h b/rosapps/applications/net/dhcpd/src/include/headers.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/headers.h
rename to rosapps/applications/net/dhcpd/src/include/headers.h
diff --git a/rosapps/net/dhcpd/src/include/iputils.h b/rosapps/applications/net/dhcpd/src/include/iputils.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/iputils.h
rename to rosapps/applications/net/dhcpd/src/include/iputils.h
diff --git a/rosapps/net/dhcpd/src/include/leases.h b/rosapps/applications/net/dhcpd/src/include/leases.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/leases.h
rename to rosapps/applications/net/dhcpd/src/include/leases.h
diff --git a/rosapps/net/dhcpd/src/include/lock.h b/rosapps/applications/net/dhcpd/src/include/lock.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/lock.h
rename to rosapps/applications/net/dhcpd/src/include/lock.h
diff --git a/rosapps/net/dhcpd/src/include/macutils.h b/rosapps/applications/net/dhcpd/src/include/macutils.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/macutils.h
rename to rosapps/applications/net/dhcpd/src/include/macutils.h
diff --git a/rosapps/net/dhcpd/src/include/options.h b/rosapps/applications/net/dhcpd/src/include/options.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/options.h
rename to rosapps/applications/net/dhcpd/src/include/options.h
diff --git a/rosapps/net/dhcpd/src/include/parser.h b/rosapps/applications/net/dhcpd/src/include/parser.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/parser.h
rename to rosapps/applications/net/dhcpd/src/include/parser.h
diff --git a/rosapps/net/dhcpd/src/include/utils.h b/rosapps/applications/net/dhcpd/src/include/utils.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/utils.h
rename to rosapps/applications/net/dhcpd/src/include/utils.h
diff --git a/rosapps/net/dhcpd/src/include/wutils.h b/rosapps/applications/net/dhcpd/src/include/wutils.h
similarity index 100%
rename from rosapps/net/dhcpd/src/include/wutils.h
rename to rosapps/applications/net/dhcpd/src/include/wutils.h
diff --git a/rosapps/net/dhcpd/src/leases/leases.c b/rosapps/applications/net/dhcpd/src/leases/leases.c
similarity index 100%
rename from rosapps/net/dhcpd/src/leases/leases.c
rename to rosapps/applications/net/dhcpd/src/leases/leases.c
diff --git a/rosapps/net/dhcpd/src/lock/locker.c b/rosapps/applications/net/dhcpd/src/lock/locker.c
similarity index 100%
rename from rosapps/net/dhcpd/src/lock/locker.c
rename to rosapps/applications/net/dhcpd/src/lock/locker.c
diff --git a/rosapps/net/dhcpd/src/main.c b/rosapps/applications/net/dhcpd/src/main.c
similarity index 100%
rename from rosapps/net/dhcpd/src/main.c
rename to rosapps/applications/net/dhcpd/src/main.c
diff --git a/rosapps/net/dhcpd/src/parsing/parser.c b/rosapps/applications/net/dhcpd/src/parsing/parser.c
similarity index 100%
rename from rosapps/net/dhcpd/src/parsing/parser.c
rename to rosapps/applications/net/dhcpd/src/parsing/parser.c
diff --git a/rosapps/net/dhcpd/src/utils/iputils.c b/rosapps/applications/net/dhcpd/src/utils/iputils.c
similarity index 100%
rename from rosapps/net/dhcpd/src/utils/iputils.c
rename to rosapps/applications/net/dhcpd/src/utils/iputils.c
diff --git a/rosapps/net/dhcpd/src/utils/macutils.c b/rosapps/applications/net/dhcpd/src/utils/macutils.c
similarity index 100%
rename from rosapps/net/dhcpd/src/utils/macutils.c
rename to rosapps/applications/net/dhcpd/src/utils/macutils.c
diff --git a/rosapps/net/dhcpd/src/utils/macutils.h b/rosapps/applications/net/dhcpd/src/utils/macutils.h
similarity index 100%
rename from rosapps/net/dhcpd/src/utils/macutils.h
rename to rosapps/applications/net/dhcpd/src/utils/macutils.h
diff --git a/rosapps/net/dhcpd/src/utils/utils.h b/rosapps/applications/net/dhcpd/src/utils/utils.h
similarity index 100%
rename from rosapps/net/dhcpd/src/utils/utils.h
rename to rosapps/applications/net/dhcpd/src/utils/utils.h
diff --git a/rosapps/net/dhcpd/src/utils/wutils.c b/rosapps/applications/net/dhcpd/src/utils/wutils.c
similarity index 100%
rename from rosapps/net/dhcpd/src/utils/wutils.c
rename to rosapps/applications/net/dhcpd/src/utils/wutils.c
diff --git a/rosapps/net/dhcpd/stamp-h b/rosapps/applications/net/dhcpd/stamp-h
similarity index 100%
rename from rosapps/net/dhcpd/stamp-h
rename to rosapps/applications/net/dhcpd/stamp-h
diff --git a/rosapps/net/dhcpd/stamp-h.in b/rosapps/applications/net/dhcpd/stamp-h.in
similarity index 100%
rename from rosapps/net/dhcpd/stamp-h.in
rename to rosapps/applications/net/dhcpd/stamp-h.in
diff --git a/rosapps/net/directory.rbuild b/rosapps/applications/net/directory.rbuild
similarity index 100%
rename from rosapps/net/directory.rbuild
rename to rosapps/applications/net/directory.rbuild
diff --git a/rosapps/net/ncftp/LICENSE.txt b/rosapps/applications/net/ncftp/LICENSE.txt
similarity index 100%
rename from rosapps/net/ncftp/LICENSE.txt
rename to rosapps/applications/net/ncftp/LICENSE.txt
diff --git a/rosapps/net/ncftp/Strn/Dynscat.c b/rosapps/applications/net/ncftp/Strn/Dynscat.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/Dynscat.c
rename to rosapps/applications/net/ncftp/Strn/Dynscat.c
diff --git a/rosapps/net/ncftp/Strn/Makefile.in b/rosapps/applications/net/ncftp/Strn/Makefile.in
similarity index 100%
rename from rosapps/net/ncftp/Strn/Makefile.in
rename to rosapps/applications/net/ncftp/Strn/Makefile.in
diff --git a/rosapps/net/ncftp/Strn/Strn.h b/rosapps/applications/net/ncftp/Strn/Strn.h
similarity index 100%
rename from rosapps/net/ncftp/Strn/Strn.h
rename to rosapps/applications/net/ncftp/Strn/Strn.h
diff --git a/rosapps/net/ncftp/Strn/Strncat.c b/rosapps/applications/net/ncftp/Strn/Strncat.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/Strncat.c
rename to rosapps/applications/net/ncftp/Strn/Strncat.c
diff --git a/rosapps/net/ncftp/Strn/Strncpy.c b/rosapps/applications/net/ncftp/Strn/Strncpy.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/Strncpy.c
rename to rosapps/applications/net/ncftp/Strn/Strncpy.c
diff --git a/rosapps/net/ncftp/Strn/Strnpcat.c b/rosapps/applications/net/ncftp/Strn/Strnpcat.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/Strnpcat.c
rename to rosapps/applications/net/ncftp/Strn/Strnpcat.c
diff --git a/rosapps/net/ncftp/Strn/Strnpcpy.c b/rosapps/applications/net/ncftp/Strn/Strnpcpy.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/Strnpcpy.c
rename to rosapps/applications/net/ncftp/Strn/Strnpcpy.c
diff --git a/rosapps/net/ncftp/Strn/Strntok.c b/rosapps/applications/net/ncftp/Strn/Strntok.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/Strntok.c
rename to rosapps/applications/net/ncftp/Strn/Strntok.c
diff --git a/rosapps/net/ncftp/Strn/config.h.in b/rosapps/applications/net/ncftp/Strn/config.h.in
similarity index 100%
rename from rosapps/net/ncftp/Strn/config.h.in
rename to rosapps/applications/net/ncftp/Strn/config.h.in
diff --git a/rosapps/net/ncftp/Strn/configure.in b/rosapps/applications/net/ncftp/Strn/configure.in
similarity index 100%
rename from rosapps/net/ncftp/Strn/configure.in
rename to rosapps/applications/net/ncftp/Strn/configure.in
diff --git a/rosapps/net/ncftp/Strn/strtokc.c b/rosapps/applications/net/ncftp/Strn/strtokc.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/strtokc.c
rename to rosapps/applications/net/ncftp/Strn/strtokc.c
diff --git a/rosapps/net/ncftp/Strn/tester.c b/rosapps/applications/net/ncftp/Strn/tester.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/tester.c
rename to rosapps/applications/net/ncftp/Strn/tester.c
diff --git a/rosapps/net/ncftp/Strn/version.c b/rosapps/applications/net/ncftp/Strn/version.c
similarity index 100%
rename from rosapps/net/ncftp/Strn/version.c
rename to rosapps/applications/net/ncftp/Strn/version.c
diff --git a/rosapps/net/ncftp/autoconf/acconfig.h b/rosapps/applications/net/ncftp/autoconf/acconfig.h
similarity index 100%
rename from rosapps/net/ncftp/autoconf/acconfig.h
rename to rosapps/applications/net/ncftp/autoconf/acconfig.h
diff --git a/rosapps/net/ncftp/autoconf/aclocal.m4 b/rosapps/applications/net/ncftp/autoconf/aclocal.m4
similarity index 100%
rename from rosapps/net/ncftp/autoconf/aclocal.m4
rename to rosapps/applications/net/ncftp/autoconf/aclocal.m4
diff --git a/rosapps/net/ncftp/libncftp/Makefile.in b/rosapps/applications/net/ncftp/libncftp/Makefile.in
similarity index 100%
rename from rosapps/net/ncftp/libncftp/Makefile.in
rename to rosapps/applications/net/ncftp/libncftp/Makefile.in
diff --git a/rosapps/net/ncftp/libncftp/Readme.txt b/rosapps/applications/net/ncftp/libncftp/Readme.txt
similarity index 100%
rename from rosapps/net/ncftp/libncftp/Readme.txt
rename to rosapps/applications/net/ncftp/libncftp/Readme.txt
diff --git a/rosapps/net/ncftp/libncftp/cmds.c b/rosapps/applications/net/ncftp/libncftp/cmds.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/cmds.c
rename to rosapps/applications/net/ncftp/libncftp/cmds.c
diff --git a/rosapps/net/ncftp/libncftp/config.h.in b/rosapps/applications/net/ncftp/libncftp/config.h.in
similarity index 100%
rename from rosapps/net/ncftp/libncftp/config.h.in
rename to rosapps/applications/net/ncftp/libncftp/config.h.in
diff --git a/rosapps/net/ncftp/libncftp/configure.in b/rosapps/applications/net/ncftp/libncftp/configure.in
similarity index 100%
rename from rosapps/net/ncftp/libncftp/configure.in
rename to rosapps/applications/net/ncftp/libncftp/configure.in
diff --git a/rosapps/net/ncftp/libncftp/dos2unix.sh b/rosapps/applications/net/ncftp/libncftp/dos2unix.sh
similarity index 100%
rename from rosapps/net/ncftp/libncftp/dos2unix.sh
rename to rosapps/applications/net/ncftp/libncftp/dos2unix.sh
diff --git a/rosapps/net/ncftp/libncftp/errno.c b/rosapps/applications/net/ncftp/libncftp/errno.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/errno.c
rename to rosapps/applications/net/ncftp/libncftp/errno.c
diff --git a/rosapps/net/ncftp/libncftp/ftp.c b/rosapps/applications/net/ncftp/libncftp/ftp.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/ftp.c
rename to rosapps/applications/net/ncftp/libncftp/ftp.c
diff --git a/rosapps/net/ncftp/libncftp/ftp.h b/rosapps/applications/net/ncftp/libncftp/ftp.h
similarity index 100%
rename from rosapps/net/ncftp/libncftp/ftp.h
rename to rosapps/applications/net/ncftp/libncftp/ftp.h
diff --git a/rosapps/net/ncftp/libncftp/glob.c b/rosapps/applications/net/ncftp/libncftp/glob.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/glob.c
rename to rosapps/applications/net/ncftp/libncftp/glob.c
diff --git a/rosapps/net/ncftp/libncftp/io.c b/rosapps/applications/net/ncftp/libncftp/io.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/io.c
rename to rosapps/applications/net/ncftp/libncftp/io.c
diff --git a/rosapps/net/ncftp/libncftp/libncftp.dsp b/rosapps/applications/net/ncftp/libncftp/libncftp.dsp
similarity index 100%
rename from rosapps/net/ncftp/libncftp/libncftp.dsp
rename to rosapps/applications/net/ncftp/libncftp/libncftp.dsp
diff --git a/rosapps/net/ncftp/libncftp/libncftp.dsw b/rosapps/applications/net/ncftp/libncftp/libncftp.dsw
similarity index 100%
rename from rosapps/net/ncftp/libncftp/libncftp.dsw
rename to rosapps/applications/net/ncftp/libncftp/libncftp.dsw
diff --git a/rosapps/net/ncftp/libncftp/linelist.c b/rosapps/applications/net/ncftp/libncftp/linelist.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/linelist.c
rename to rosapps/applications/net/ncftp/libncftp/linelist.c
diff --git a/rosapps/net/ncftp/libncftp/mksrctar.sh b/rosapps/applications/net/ncftp/libncftp/mksrctar.sh
similarity index 100%
rename from rosapps/net/ncftp/libncftp/mksrctar.sh
rename to rosapps/applications/net/ncftp/libncftp/mksrctar.sh
diff --git a/rosapps/net/ncftp/libncftp/mksrczip.bat b/rosapps/applications/net/ncftp/libncftp/mksrczip.bat
similarity index 100%
rename from rosapps/net/ncftp/libncftp/mksrczip.bat
rename to rosapps/applications/net/ncftp/libncftp/mksrczip.bat
diff --git a/rosapps/net/ncftp/libncftp/ncftp.h b/rosapps/applications/net/ncftp/libncftp/ncftp.h
similarity index 100%
rename from rosapps/net/ncftp/libncftp/ncftp.h
rename to rosapps/applications/net/ncftp/libncftp/ncftp.h
diff --git a/rosapps/net/ncftp/libncftp/ncftp_errno.h b/rosapps/applications/net/ncftp/libncftp/ncftp_errno.h
similarity index 100%
rename from rosapps/net/ncftp/libncftp/ncftp_errno.h
rename to rosapps/applications/net/ncftp/libncftp/ncftp_errno.h
diff --git a/rosapps/net/ncftp/libncftp/open.c b/rosapps/applications/net/ncftp/libncftp/open.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/open.c
rename to rosapps/applications/net/ncftp/libncftp/open.c
diff --git a/rosapps/net/ncftp/libncftp/rcmd.c b/rosapps/applications/net/ncftp/libncftp/rcmd.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/rcmd.c
rename to rosapps/applications/net/ncftp/libncftp/rcmd.c
diff --git a/rosapps/net/ncftp/libncftp/syshdrs.h b/rosapps/applications/net/ncftp/libncftp/syshdrs.h
similarity index 100%
rename from rosapps/net/ncftp/libncftp/syshdrs.h
rename to rosapps/applications/net/ncftp/libncftp/syshdrs.h
diff --git a/rosapps/net/ncftp/libncftp/util.c b/rosapps/applications/net/ncftp/libncftp/util.c
similarity index 100%
rename from rosapps/net/ncftp/libncftp/util.c
rename to rosapps/applications/net/ncftp/libncftp/util.c
diff --git a/rosapps/net/ncftp/libncftp/util.h b/rosapps/applications/net/ncftp/libncftp/util.h
similarity index 100%
rename from rosapps/net/ncftp/libncftp/util.h
rename to rosapps/applications/net/ncftp/libncftp/util.h
diff --git a/rosapps/net/ncftp/libncftp/util2.cpp b/rosapps/applications/net/ncftp/libncftp/util2.cpp
similarity index 100%
rename from rosapps/net/ncftp/libncftp/util2.cpp
rename to rosapps/applications/net/ncftp/libncftp/util2.cpp
diff --git a/rosapps/net/ncftp/libncftp/wincfg.h b/rosapps/applications/net/ncftp/libncftp/wincfg.h
similarity index 100%
rename from rosapps/net/ncftp/libncftp/wincfg.h
rename to rosapps/applications/net/ncftp/libncftp/wincfg.h
diff --git a/rosapps/net/ncftp/ncftp.rbuild b/rosapps/applications/net/ncftp/ncftp.rbuild
similarity index 100%
rename from rosapps/net/ncftp/ncftp.rbuild
rename to rosapps/applications/net/ncftp/ncftp.rbuild
diff --git a/rosapps/net/ncftp/ncftp.rc b/rosapps/applications/net/ncftp/ncftp.rc
similarity index 100%
rename from rosapps/net/ncftp/ncftp.rc
rename to rosapps/applications/net/ncftp/ncftp.rc
diff --git a/rosapps/net/ncftp/ncftp/Makefile.in b/rosapps/applications/net/ncftp/ncftp/Makefile.in
similarity index 100%
rename from rosapps/net/ncftp/ncftp/Makefile.in
rename to rosapps/applications/net/ncftp/ncftp/Makefile.in
diff --git a/rosapps/net/ncftp/ncftp/bookmark.c b/rosapps/applications/net/ncftp/ncftp/bookmark.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/bookmark.c
rename to rosapps/applications/net/ncftp/ncftp/bookmark.c
diff --git a/rosapps/net/ncftp/ncftp/bookmark.h b/rosapps/applications/net/ncftp/ncftp/bookmark.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/bookmark.h
rename to rosapps/applications/net/ncftp/ncftp/bookmark.h
diff --git a/rosapps/net/ncftp/ncftp/cmdlist.c b/rosapps/applications/net/ncftp/ncftp/cmdlist.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/cmdlist.c
rename to rosapps/applications/net/ncftp/ncftp/cmdlist.c
diff --git a/rosapps/net/ncftp/ncftp/cmds.c b/rosapps/applications/net/ncftp/ncftp/cmds.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/cmds.c
rename to rosapps/applications/net/ncftp/ncftp/cmds.c
diff --git a/rosapps/net/ncftp/ncftp/cmds.h b/rosapps/applications/net/ncftp/ncftp/cmds.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/cmds.h
rename to rosapps/applications/net/ncftp/ncftp/cmds.h
diff --git a/rosapps/net/ncftp/ncftp/getline.c b/rosapps/applications/net/ncftp/ncftp/getline.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/getline.c
rename to rosapps/applications/net/ncftp/ncftp/getline.c
diff --git a/rosapps/net/ncftp/ncftp/getline.h b/rosapps/applications/net/ncftp/ncftp/getline.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/getline.h
rename to rosapps/applications/net/ncftp/ncftp/getline.h
diff --git a/rosapps/net/ncftp/ncftp/getopt.c b/rosapps/applications/net/ncftp/ncftp/getopt.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/getopt.c
rename to rosapps/applications/net/ncftp/ncftp/getopt.c
diff --git a/rosapps/net/ncftp/ncftp/getopt.h b/rosapps/applications/net/ncftp/ncftp/getopt.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/getopt.h
rename to rosapps/applications/net/ncftp/ncftp/getopt.h
diff --git a/rosapps/net/ncftp/ncftp/log.c b/rosapps/applications/net/ncftp/ncftp/log.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/log.c
rename to rosapps/applications/net/ncftp/ncftp/log.c
diff --git a/rosapps/net/ncftp/ncftp/log.h b/rosapps/applications/net/ncftp/ncftp/log.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/log.h
rename to rosapps/applications/net/ncftp/ncftp/log.h
diff --git a/rosapps/net/ncftp/ncftp/ls.c b/rosapps/applications/net/ncftp/ncftp/ls.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/ls.c
rename to rosapps/applications/net/ncftp/ncftp/ls.c
diff --git a/rosapps/net/ncftp/ncftp/ls.h b/rosapps/applications/net/ncftp/ncftp/ls.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/ls.h
rename to rosapps/applications/net/ncftp/ncftp/ls.h
diff --git a/rosapps/net/ncftp/ncftp/main.c b/rosapps/applications/net/ncftp/ncftp/main.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/main.c
rename to rosapps/applications/net/ncftp/ncftp/main.c
diff --git a/rosapps/net/ncftp/ncftp/main.h b/rosapps/applications/net/ncftp/ncftp/main.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/main.h
rename to rosapps/applications/net/ncftp/ncftp/main.h
diff --git a/rosapps/net/ncftp/ncftp/pref.c b/rosapps/applications/net/ncftp/ncftp/pref.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/pref.c
rename to rosapps/applications/net/ncftp/ncftp/pref.c
diff --git a/rosapps/net/ncftp/ncftp/pref.h b/rosapps/applications/net/ncftp/ncftp/pref.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/pref.h
rename to rosapps/applications/net/ncftp/ncftp/pref.h
diff --git a/rosapps/net/ncftp/ncftp/preffw.c b/rosapps/applications/net/ncftp/ncftp/preffw.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/preffw.c
rename to rosapps/applications/net/ncftp/ncftp/preffw.c
diff --git a/rosapps/net/ncftp/ncftp/progress.c b/rosapps/applications/net/ncftp/ncftp/progress.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/progress.c
rename to rosapps/applications/net/ncftp/ncftp/progress.c
diff --git a/rosapps/net/ncftp/ncftp/progress.h b/rosapps/applications/net/ncftp/ncftp/progress.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/progress.h
rename to rosapps/applications/net/ncftp/ncftp/progress.h
diff --git a/rosapps/net/ncftp/ncftp/readln.c b/rosapps/applications/net/ncftp/ncftp/readln.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/readln.c
rename to rosapps/applications/net/ncftp/ncftp/readln.c
diff --git a/rosapps/net/ncftp/ncftp/readln.h b/rosapps/applications/net/ncftp/ncftp/readln.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/readln.h
rename to rosapps/applications/net/ncftp/ncftp/readln.h
diff --git a/rosapps/net/ncftp/ncftp/resource.h b/rosapps/applications/net/ncftp/ncftp/resource.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/resource.h
rename to rosapps/applications/net/ncftp/ncftp/resource.h
diff --git a/rosapps/net/ncftp/ncftp/shell.c b/rosapps/applications/net/ncftp/ncftp/shell.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/shell.c
rename to rosapps/applications/net/ncftp/ncftp/shell.c
diff --git a/rosapps/net/ncftp/ncftp/shell.h b/rosapps/applications/net/ncftp/ncftp/shell.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/shell.h
rename to rosapps/applications/net/ncftp/ncftp/shell.h
diff --git a/rosapps/net/ncftp/ncftp/spool.c b/rosapps/applications/net/ncftp/ncftp/spool.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/spool.c
rename to rosapps/applications/net/ncftp/ncftp/spool.c
diff --git a/rosapps/net/ncftp/ncftp/spool.h b/rosapps/applications/net/ncftp/ncftp/spool.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/spool.h
rename to rosapps/applications/net/ncftp/ncftp/spool.h
diff --git a/rosapps/net/ncftp/ncftp/syshdrs.h b/rosapps/applications/net/ncftp/ncftp/syshdrs.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/syshdrs.h
rename to rosapps/applications/net/ncftp/ncftp/syshdrs.h
diff --git a/rosapps/net/ncftp/ncftp/trace.c b/rosapps/applications/net/ncftp/ncftp/trace.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/trace.c
rename to rosapps/applications/net/ncftp/ncftp/trace.c
diff --git a/rosapps/net/ncftp/ncftp/trace.h b/rosapps/applications/net/ncftp/ncftp/trace.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/trace.h
rename to rosapps/applications/net/ncftp/ncftp/trace.h
diff --git a/rosapps/net/ncftp/ncftp/util.c b/rosapps/applications/net/ncftp/ncftp/util.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/util.c
rename to rosapps/applications/net/ncftp/ncftp/util.c
diff --git a/rosapps/net/ncftp/ncftp/util.h b/rosapps/applications/net/ncftp/ncftp/util.h
similarity index 100%
rename from rosapps/net/ncftp/ncftp/util.h
rename to rosapps/applications/net/ncftp/ncftp/util.h
diff --git a/rosapps/net/ncftp/ncftp/version.c b/rosapps/applications/net/ncftp/ncftp/version.c
similarity index 100%
rename from rosapps/net/ncftp/ncftp/version.c
rename to rosapps/applications/net/ncftp/ncftp/version.c
diff --git a/rosapps/net/ncftp/sio/Makefile.in b/rosapps/applications/net/ncftp/sio/Makefile.in
similarity index 100%
rename from rosapps/net/ncftp/sio/Makefile.in
rename to rosapps/applications/net/ncftp/sio/Makefile.in
diff --git a/rosapps/net/ncftp/sio/PRead.c b/rosapps/applications/net/ncftp/sio/PRead.c
similarity index 100%
rename from rosapps/net/ncftp/sio/PRead.c
rename to rosapps/applications/net/ncftp/sio/PRead.c
diff --git a/rosapps/net/ncftp/sio/PWrite.c b/rosapps/applications/net/ncftp/sio/PWrite.c
similarity index 100%
rename from rosapps/net/ncftp/sio/PWrite.c
rename to rosapps/applications/net/ncftp/sio/PWrite.c
diff --git a/rosapps/net/ncftp/sio/SAcceptA.c b/rosapps/applications/net/ncftp/sio/SAcceptA.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SAcceptA.c
rename to rosapps/applications/net/ncftp/sio/SAcceptA.c
diff --git a/rosapps/net/ncftp/sio/SAcceptS.c b/rosapps/applications/net/ncftp/sio/SAcceptS.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SAcceptS.c
rename to rosapps/applications/net/ncftp/sio/SAcceptS.c
diff --git a/rosapps/net/ncftp/sio/SBind.c b/rosapps/applications/net/ncftp/sio/SBind.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SBind.c
rename to rosapps/applications/net/ncftp/sio/SBind.c
diff --git a/rosapps/net/ncftp/sio/SClose.c b/rosapps/applications/net/ncftp/sio/SClose.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SClose.c
rename to rosapps/applications/net/ncftp/sio/SClose.c
diff --git a/rosapps/net/ncftp/sio/SConnect.c b/rosapps/applications/net/ncftp/sio/SConnect.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SConnect.c
rename to rosapps/applications/net/ncftp/sio/SConnect.c
diff --git a/rosapps/net/ncftp/sio/SConnectByName.c b/rosapps/applications/net/ncftp/sio/SConnectByName.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SConnectByName.c
rename to rosapps/applications/net/ncftp/sio/SConnectByName.c
diff --git a/rosapps/net/ncftp/sio/SError.c b/rosapps/applications/net/ncftp/sio/SError.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SError.c
rename to rosapps/applications/net/ncftp/sio/SError.c
diff --git a/rosapps/net/ncftp/sio/SNew.c b/rosapps/applications/net/ncftp/sio/SNew.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SNew.c
rename to rosapps/applications/net/ncftp/sio/SNew.c
diff --git a/rosapps/net/ncftp/sio/SRead.c b/rosapps/applications/net/ncftp/sio/SRead.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SRead.c
rename to rosapps/applications/net/ncftp/sio/SRead.c
diff --git a/rosapps/net/ncftp/sio/SReadline.c b/rosapps/applications/net/ncftp/sio/SReadline.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SReadline.c
rename to rosapps/applications/net/ncftp/sio/SReadline.c
diff --git a/rosapps/net/ncftp/sio/SRecv.c b/rosapps/applications/net/ncftp/sio/SRecv.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SRecv.c
rename to rosapps/applications/net/ncftp/sio/SRecv.c
diff --git a/rosapps/net/ncftp/sio/SRecvfrom.c b/rosapps/applications/net/ncftp/sio/SRecvfrom.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SRecvfrom.c
rename to rosapps/applications/net/ncftp/sio/SRecvfrom.c
diff --git a/rosapps/net/ncftp/sio/SRecvmsg.c b/rosapps/applications/net/ncftp/sio/SRecvmsg.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SRecvmsg.c
rename to rosapps/applications/net/ncftp/sio/SRecvmsg.c
diff --git a/rosapps/net/ncftp/sio/SSelect.c b/rosapps/applications/net/ncftp/sio/SSelect.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SSelect.c
rename to rosapps/applications/net/ncftp/sio/SSelect.c
diff --git a/rosapps/net/ncftp/sio/SSend.c b/rosapps/applications/net/ncftp/sio/SSend.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SSend.c
rename to rosapps/applications/net/ncftp/sio/SSend.c
diff --git a/rosapps/net/ncftp/sio/SSendto.c b/rosapps/applications/net/ncftp/sio/SSendto.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SSendto.c
rename to rosapps/applications/net/ncftp/sio/SSendto.c
diff --git a/rosapps/net/ncftp/sio/SSendtoByName.c b/rosapps/applications/net/ncftp/sio/SSendtoByName.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SSendtoByName.c
rename to rosapps/applications/net/ncftp/sio/SSendtoByName.c
diff --git a/rosapps/net/ncftp/sio/SWait.c b/rosapps/applications/net/ncftp/sio/SWait.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SWait.c
rename to rosapps/applications/net/ncftp/sio/SWait.c
diff --git a/rosapps/net/ncftp/sio/SWrite.c b/rosapps/applications/net/ncftp/sio/SWrite.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SWrite.c
rename to rosapps/applications/net/ncftp/sio/SWrite.c
diff --git a/rosapps/net/ncftp/sio/SocketUtil.c b/rosapps/applications/net/ncftp/sio/SocketUtil.c
similarity index 100%
rename from rosapps/net/ncftp/sio/SocketUtil.c
rename to rosapps/applications/net/ncftp/sio/SocketUtil.c
diff --git a/rosapps/net/ncftp/sio/StrAddr.c b/rosapps/applications/net/ncftp/sio/StrAddr.c
similarity index 100%
rename from rosapps/net/ncftp/sio/StrAddr.c
rename to rosapps/applications/net/ncftp/sio/StrAddr.c
diff --git a/rosapps/net/ncftp/sio/UAcceptA.c b/rosapps/applications/net/ncftp/sio/UAcceptA.c
similarity index 100%
rename from rosapps/net/ncftp/sio/UAcceptA.c
rename to rosapps/applications/net/ncftp/sio/UAcceptA.c
diff --git a/rosapps/net/ncftp/sio/UAcceptS.c b/rosapps/applications/net/ncftp/sio/UAcceptS.c
similarity index 100%
rename from rosapps/net/ncftp/sio/UAcceptS.c
rename to rosapps/applications/net/ncftp/sio/UAcceptS.c
diff --git a/rosapps/net/ncftp/sio/UBind.c b/rosapps/applications/net/ncftp/sio/UBind.c
similarity index 100%
rename from rosapps/net/ncftp/sio/UBind.c
rename to rosapps/applications/net/ncftp/sio/UBind.c
diff --git a/rosapps/net/ncftp/sio/UConnect.c b/rosapps/applications/net/ncftp/sio/UConnect.c
similarity index 100%
rename from rosapps/net/ncftp/sio/UConnect.c
rename to rosapps/applications/net/ncftp/sio/UConnect.c
diff --git a/rosapps/net/ncftp/sio/UConnectByName.c b/rosapps/applications/net/ncftp/sio/UConnectByName.c
similarity index 100%
rename from rosapps/net/ncftp/sio/UConnectByName.c
rename to rosapps/applications/net/ncftp/sio/UConnectByName.c
diff --git a/rosapps/net/ncftp/sio/UNew.c b/rosapps/applications/net/ncftp/sio/UNew.c
similarity index 100%
rename from rosapps/net/ncftp/sio/UNew.c
rename to rosapps/applications/net/ncftp/sio/UNew.c
diff --git a/rosapps/net/ncftp/sio/URecvfrom.c b/rosapps/applications/net/ncftp/sio/URecvfrom.c
similarity index 100%
rename from rosapps/net/ncftp/sio/URecvfrom.c
rename to rosapps/applications/net/ncftp/sio/URecvfrom.c
diff --git a/rosapps/net/ncftp/sio/USendto.c b/rosapps/applications/net/ncftp/sio/USendto.c
similarity index 100%
rename from rosapps/net/ncftp/sio/USendto.c
rename to rosapps/applications/net/ncftp/sio/USendto.c
diff --git a/rosapps/net/ncftp/sio/USendtoByName.c b/rosapps/applications/net/ncftp/sio/USendtoByName.c
similarity index 100%
rename from rosapps/net/ncftp/sio/USendtoByName.c
rename to rosapps/applications/net/ncftp/sio/USendtoByName.c
diff --git a/rosapps/net/ncftp/sio/config.h.in b/rosapps/applications/net/ncftp/sio/config.h.in
similarity index 100%
rename from rosapps/net/ncftp/sio/config.h.in
rename to rosapps/applications/net/ncftp/sio/config.h.in
diff --git a/rosapps/net/ncftp/sio/configure.in b/rosapps/applications/net/ncftp/sio/configure.in
similarity index 100%
rename from rosapps/net/ncftp/sio/configure.in
rename to rosapps/applications/net/ncftp/sio/configure.in
diff --git a/rosapps/net/ncftp/sio/main.c b/rosapps/applications/net/ncftp/sio/main.c
similarity index 100%
rename from rosapps/net/ncftp/sio/main.c
rename to rosapps/applications/net/ncftp/sio/main.c
diff --git a/rosapps/net/ncftp/sio/sio.h b/rosapps/applications/net/ncftp/sio/sio.h
similarity index 100%
rename from rosapps/net/ncftp/sio/sio.h
rename to rosapps/applications/net/ncftp/sio/sio.h
diff --git a/rosapps/net/ncftp/sio/sio.html b/rosapps/applications/net/ncftp/sio/sio.html
similarity index 100%
rename from rosapps/net/ncftp/sio/sio.html
rename to rosapps/applications/net/ncftp/sio/sio.html
diff --git a/rosapps/net/ncftp/sio/srltest.c b/rosapps/applications/net/ncftp/sio/srltest.c
similarity index 100%
rename from rosapps/net/ncftp/sio/srltest.c
rename to rosapps/applications/net/ncftp/sio/srltest.c
diff --git a/rosapps/net/ncftp/sio/syshdrs.h b/rosapps/applications/net/ncftp/sio/syshdrs.h
similarity index 100%
rename from rosapps/net/ncftp/sio/syshdrs.h
rename to rosapps/applications/net/ncftp/sio/syshdrs.h
diff --git a/rosapps/net/ncftp/sio/usio.h b/rosapps/applications/net/ncftp/sio/usio.h
similarity index 100%
rename from rosapps/net/ncftp/sio/usio.h
rename to rosapps/applications/net/ncftp/sio/usio.h
diff --git a/rosapps/net/ncftp/sio/wincfg.h b/rosapps/applications/net/ncftp/sio/wincfg.h
similarity index 100%
rename from rosapps/net/ncftp/sio/wincfg.h
rename to rosapps/applications/net/ncftp/sio/wincfg.h
diff --git a/rosapps/net/netreg/netreg.cpp b/rosapps/applications/net/netreg/netreg.cpp
similarity index 100%
rename from rosapps/net/netreg/netreg.cpp
rename to rosapps/applications/net/netreg/netreg.cpp
diff --git a/rosapps/net/netreg/netreg.rbuild b/rosapps/applications/net/netreg/netreg.rbuild
similarity index 100%
rename from rosapps/net/netreg/netreg.rbuild
rename to rosapps/applications/net/netreg/netreg.rbuild
diff --git a/rosapps/net/netreg/netreg.rc b/rosapps/applications/net/netreg/netreg.rc
similarity index 100%
rename from rosapps/net/netreg/netreg.rc
rename to rosapps/applications/net/netreg/netreg.rc
diff --git a/rosapps/net/niclist/niclist.c b/rosapps/applications/net/niclist/niclist.c
similarity index 100%
rename from rosapps/net/niclist/niclist.c
rename to rosapps/applications/net/niclist/niclist.c
diff --git a/rosapps/net/niclist/niclist.rbuild b/rosapps/applications/net/niclist/niclist.rbuild
similarity index 100%
rename from rosapps/net/niclist/niclist.rbuild
rename to rosapps/applications/net/niclist/niclist.rbuild
diff --git a/rosapps/net/niclist/niclist.rc b/rosapps/applications/net/niclist/niclist.rc
similarity index 100%
rename from rosapps/net/niclist/niclist.rc
rename to rosapps/applications/net/niclist/niclist.rc
diff --git a/rosapps/net/tditest/DIRS b/rosapps/applications/net/tditest/DIRS
similarity index 100%
rename from rosapps/net/tditest/DIRS
rename to rosapps/applications/net/tditest/DIRS
diff --git a/rosapps/net/tditest/include/debug.h b/rosapps/applications/net/tditest/include/debug.h
similarity index 100%
rename from rosapps/net/tditest/include/debug.h
rename to rosapps/applications/net/tditest/include/debug.h
diff --git a/rosapps/net/tditest/include/tditest.h b/rosapps/applications/net/tditest/include/tditest.h
similarity index 100%
rename from rosapps/net/tditest/include/tditest.h
rename to rosapps/applications/net/tditest/include/tditest.h
diff --git a/rosapps/net/tditest/readme.txt b/rosapps/applications/net/tditest/readme.txt
similarity index 100%
rename from rosapps/net/tditest/readme.txt
rename to rosapps/applications/net/tditest/readme.txt
diff --git a/rosapps/net/tditest/tditest.def b/rosapps/applications/net/tditest/tditest.def
similarity index 100%
rename from rosapps/net/tditest/tditest.def
rename to rosapps/applications/net/tditest/tditest.def
diff --git a/rosapps/net/tditest/tditest.rbuild b/rosapps/applications/net/tditest/tditest.rbuild
similarity index 100%
rename from rosapps/net/tditest/tditest.rbuild
rename to rosapps/applications/net/tditest/tditest.rbuild
diff --git a/rosapps/net/tditest/tditest.rc b/rosapps/applications/net/tditest/tditest.rc
similarity index 100%
rename from rosapps/net/tditest/tditest.rc
rename to rosapps/applications/net/tditest/tditest.rc
diff --git a/rosapps/net/tditest/tditest/SOURCES b/rosapps/applications/net/tditest/tditest/SOURCES
similarity index 100%
rename from rosapps/net/tditest/tditest/SOURCES
rename to rosapps/applications/net/tditest/tditest/SOURCES
diff --git a/rosapps/net/tditest/tditest/tditest.c b/rosapps/applications/net/tditest/tditest/tditest.c
similarity index 100%
rename from rosapps/net/tditest/tditest/tditest.c
rename to rosapps/applications/net/tditest/tditest/tditest.c
diff --git a/rosapps/notevil/notevil.c b/rosapps/applications/notevil/notevil.c
similarity index 100%
rename from rosapps/notevil/notevil.c
rename to rosapps/applications/notevil/notevil.c
diff --git a/rosapps/notevil/notevil.rbuild b/rosapps/applications/notevil/notevil.rbuild
similarity index 100%
rename from rosapps/notevil/notevil.rbuild
rename to rosapps/applications/notevil/notevil.rbuild
diff --git a/rosapps/notevil/notevil.rc b/rosapps/applications/notevil/notevil.rc
similarity index 100%
rename from rosapps/notevil/notevil.rc
rename to rosapps/applications/notevil/notevil.rc
diff --git a/rosapps/notevil/readme.txt b/rosapps/applications/notevil/readme.txt
similarity index 90%
rename from rosapps/notevil/readme.txt
rename to rosapps/applications/notevil/readme.txt
index 82f45c5cc61..b12d11b2247 100644
--- a/rosapps/notevil/readme.txt
+++ b/rosapps/applications/notevil/readme.txt
@@ -1,4 +1,4 @@
-$Id: readme.txt,v 1.1 1999/05/15 07:23:34 ea Exp $
+$Id$
 
 ReactOS Coders Console Parade
 -----------------------------
diff --git a/rosapps/notevil/resource.h b/rosapps/applications/notevil/resource.h
similarity index 100%
rename from rosapps/notevil/resource.h
rename to rosapps/applications/notevil/resource.h
diff --git a/rosapps/old_wordpad/about.c b/rosapps/applications/old_wordpad/about.c
similarity index 100%
rename from rosapps/old_wordpad/about.c
rename to rosapps/applications/old_wordpad/about.c
diff --git a/rosapps/old_wordpad/dialogs.c b/rosapps/applications/old_wordpad/dialogs.c
similarity index 100%
rename from rosapps/old_wordpad/dialogs.c
rename to rosapps/applications/old_wordpad/dialogs.c
diff --git a/rosapps/old_wordpad/editwnd.c b/rosapps/applications/old_wordpad/editwnd.c
similarity index 100%
rename from rosapps/old_wordpad/editwnd.c
rename to rosapps/applications/old_wordpad/editwnd.c
diff --git a/rosapps/old_wordpad/lang/bg-BG.rc b/rosapps/applications/old_wordpad/lang/bg-BG.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/bg-BG.rc
rename to rosapps/applications/old_wordpad/lang/bg-BG.rc
diff --git a/rosapps/old_wordpad/lang/de-DE.rc b/rosapps/applications/old_wordpad/lang/de-DE.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/de-DE.rc
rename to rosapps/applications/old_wordpad/lang/de-DE.rc
diff --git a/rosapps/old_wordpad/lang/el-GR.rc b/rosapps/applications/old_wordpad/lang/el-GR.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/el-GR.rc
rename to rosapps/applications/old_wordpad/lang/el-GR.rc
diff --git a/rosapps/old_wordpad/lang/en-US.rc b/rosapps/applications/old_wordpad/lang/en-US.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/en-US.rc
rename to rosapps/applications/old_wordpad/lang/en-US.rc
diff --git a/rosapps/old_wordpad/lang/fi-FI.rc b/rosapps/applications/old_wordpad/lang/fi-FI.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/fi-FI.rc
rename to rosapps/applications/old_wordpad/lang/fi-FI.rc
diff --git a/rosapps/old_wordpad/lang/fr-FR.rc b/rosapps/applications/old_wordpad/lang/fr-FR.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/fr-FR.rc
rename to rosapps/applications/old_wordpad/lang/fr-FR.rc
diff --git a/rosapps/old_wordpad/lang/it-IT.rc b/rosapps/applications/old_wordpad/lang/it-IT.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/it-IT.rc
rename to rosapps/applications/old_wordpad/lang/it-IT.rc
diff --git a/rosapps/old_wordpad/lang/nb-NO.rc b/rosapps/applications/old_wordpad/lang/nb-NO.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/nb-NO.rc
rename to rosapps/applications/old_wordpad/lang/nb-NO.rc
diff --git a/rosapps/old_wordpad/lang/nl-NL.rc b/rosapps/applications/old_wordpad/lang/nl-NL.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/nl-NL.rc
rename to rosapps/applications/old_wordpad/lang/nl-NL.rc
diff --git a/rosapps/old_wordpad/lang/pl-PL.rc b/rosapps/applications/old_wordpad/lang/pl-PL.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/pl-PL.rc
rename to rosapps/applications/old_wordpad/lang/pl-PL.rc
diff --git a/rosapps/old_wordpad/lang/ru-RU.rc b/rosapps/applications/old_wordpad/lang/ru-RU.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/ru-RU.rc
rename to rosapps/applications/old_wordpad/lang/ru-RU.rc
diff --git a/rosapps/old_wordpad/lang/th-TH.rc b/rosapps/applications/old_wordpad/lang/th-TH.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/th-TH.rc
rename to rosapps/applications/old_wordpad/lang/th-TH.rc
diff --git a/rosapps/old_wordpad/lang/uk-UA.rc b/rosapps/applications/old_wordpad/lang/uk-UA.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/uk-UA.rc
rename to rosapps/applications/old_wordpad/lang/uk-UA.rc
diff --git a/rosapps/old_wordpad/lang/zh-CN.rc b/rosapps/applications/old_wordpad/lang/zh-CN.rc
similarity index 100%
rename from rosapps/old_wordpad/lang/zh-CN.rc
rename to rosapps/applications/old_wordpad/lang/zh-CN.rc
diff --git a/rosapps/old_wordpad/mainwnd.c b/rosapps/applications/old_wordpad/mainwnd.c
similarity index 100%
rename from rosapps/old_wordpad/mainwnd.c
rename to rosapps/applications/old_wordpad/mainwnd.c
diff --git a/rosapps/old_wordpad/misc.c b/rosapps/applications/old_wordpad/misc.c
similarity index 100%
rename from rosapps/old_wordpad/misc.c
rename to rosapps/applications/old_wordpad/misc.c
diff --git a/rosapps/old_wordpad/old_wordpad.rbuild b/rosapps/applications/old_wordpad/old_wordpad.rbuild
similarity index 100%
rename from rosapps/old_wordpad/old_wordpad.rbuild
rename to rosapps/applications/old_wordpad/old_wordpad.rbuild
diff --git a/rosapps/old_wordpad/opensave.c b/rosapps/applications/old_wordpad/opensave.c
similarity index 100%
rename from rosapps/old_wordpad/opensave.c
rename to rosapps/applications/old_wordpad/opensave.c
diff --git a/rosapps/old_wordpad/precomp.h b/rosapps/applications/old_wordpad/precomp.h
similarity index 100%
rename from rosapps/old_wordpad/precomp.h
rename to rosapps/applications/old_wordpad/precomp.h
diff --git a/rosapps/old_wordpad/res/toolbar.bmp b/rosapps/applications/old_wordpad/res/toolbar.bmp
similarity index 100%
rename from rosapps/old_wordpad/res/toolbar.bmp
rename to rosapps/applications/old_wordpad/res/toolbar.bmp
diff --git a/rosapps/old_wordpad/res/wordpad.ico b/rosapps/applications/old_wordpad/res/wordpad.ico
similarity index 100%
rename from rosapps/old_wordpad/res/wordpad.ico
rename to rosapps/applications/old_wordpad/res/wordpad.ico
diff --git a/rosapps/old_wordpad/resource.h b/rosapps/applications/old_wordpad/resource.h
similarity index 100%
rename from rosapps/old_wordpad/resource.h
rename to rosapps/applications/old_wordpad/resource.h
diff --git a/rosapps/old_wordpad/rsrc.rc b/rosapps/applications/old_wordpad/rsrc.rc
similarity index 100%
rename from rosapps/old_wordpad/rsrc.rc
rename to rosapps/applications/old_wordpad/rsrc.rc
diff --git a/rosapps/old_wordpad/wordpad.c b/rosapps/applications/old_wordpad/wordpad.c
similarity index 100%
rename from rosapps/old_wordpad/wordpad.c
rename to rosapps/applications/old_wordpad/wordpad.c
diff --git a/rosapps/old_wordpad/wordpad.rc b/rosapps/applications/old_wordpad/wordpad.rc
similarity index 100%
rename from rosapps/old_wordpad/wordpad.rc
rename to rosapps/applications/old_wordpad/wordpad.rc
diff --git a/rosapps/packmgr/cmd-line/main.c b/rosapps/applications/packmgr/cmd-line/main.c
similarity index 100%
rename from rosapps/packmgr/cmd-line/main.c
rename to rosapps/applications/packmgr/cmd-line/main.c
diff --git a/rosapps/packmgr/cmd-line/main.h b/rosapps/applications/packmgr/cmd-line/main.h
similarity index 100%
rename from rosapps/packmgr/cmd-line/main.h
rename to rosapps/applications/packmgr/cmd-line/main.h
diff --git a/rosapps/packmgr/cmd-line/ros-get.rc b/rosapps/applications/packmgr/cmd-line/ros-get.rc
similarity index 100%
rename from rosapps/packmgr/cmd-line/ros-get.rc
rename to rosapps/applications/packmgr/cmd-line/ros-get.rc
diff --git a/rosapps/packmgr/cmd-line/rosget.rbuild b/rosapps/applications/packmgr/cmd-line/rosget.rbuild
similarity index 100%
rename from rosapps/packmgr/cmd-line/rosget.rbuild
rename to rosapps/applications/packmgr/cmd-line/rosget.rbuild
diff --git a/rosapps/packmgr/directory.rbuild b/rosapps/applications/packmgr/directory.rbuild
similarity index 100%
rename from rosapps/packmgr/directory.rbuild
rename to rosapps/applications/packmgr/directory.rbuild
diff --git a/rosapps/packmgr/gui/generic.rc b/rosapps/applications/packmgr/gui/generic.rc
similarity index 100%
rename from rosapps/packmgr/gui/generic.rc
rename to rosapps/applications/packmgr/gui/generic.rc
diff --git a/rosapps/packmgr/gui/help.txt b/rosapps/applications/packmgr/gui/help.txt
similarity index 100%
rename from rosapps/packmgr/gui/help.txt
rename to rosapps/applications/packmgr/gui/help.txt
diff --git a/rosapps/packmgr/gui/lang/cs-CZ.rc b/rosapps/applications/packmgr/gui/lang/cs-CZ.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/cs-CZ.rc
rename to rosapps/applications/packmgr/gui/lang/cs-CZ.rc
diff --git a/rosapps/packmgr/gui/lang/de-DE.rc b/rosapps/applications/packmgr/gui/lang/de-DE.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/de-DE.rc
rename to rosapps/applications/packmgr/gui/lang/de-DE.rc
diff --git a/rosapps/packmgr/gui/lang/en-US.rc b/rosapps/applications/packmgr/gui/lang/en-US.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/en-US.rc
rename to rosapps/applications/packmgr/gui/lang/en-US.rc
diff --git a/rosapps/packmgr/gui/lang/es-ES.rc b/rosapps/applications/packmgr/gui/lang/es-ES.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/es-ES.rc
rename to rosapps/applications/packmgr/gui/lang/es-ES.rc
diff --git a/rosapps/packmgr/gui/lang/fr-FR.rc b/rosapps/applications/packmgr/gui/lang/fr-FR.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/fr-FR.rc
rename to rosapps/applications/packmgr/gui/lang/fr-FR.rc
diff --git a/rosapps/packmgr/gui/lang/pl-PL.rc b/rosapps/applications/packmgr/gui/lang/pl-PL.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/pl-PL.rc
rename to rosapps/applications/packmgr/gui/lang/pl-PL.rc
diff --git a/rosapps/packmgr/gui/lang/ru-RU.rc b/rosapps/applications/packmgr/gui/lang/ru-RU.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/ru-RU.rc
rename to rosapps/applications/packmgr/gui/lang/ru-RU.rc
diff --git a/rosapps/packmgr/gui/lang/sk-SK.rc b/rosapps/applications/packmgr/gui/lang/sk-SK.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/sk-SK.rc
rename to rosapps/applications/packmgr/gui/lang/sk-SK.rc
diff --git a/rosapps/packmgr/gui/lang/uk-UA.rc b/rosapps/applications/packmgr/gui/lang/uk-UA.rc
similarity index 100%
rename from rosapps/packmgr/gui/lang/uk-UA.rc
rename to rosapps/applications/packmgr/gui/lang/uk-UA.rc
diff --git a/rosapps/packmgr/gui/main.c b/rosapps/applications/packmgr/gui/main.c
similarity index 100%
rename from rosapps/packmgr/gui/main.c
rename to rosapps/applications/packmgr/gui/main.c
diff --git a/rosapps/packmgr/gui/main.h b/rosapps/applications/packmgr/gui/main.h
similarity index 100%
rename from rosapps/packmgr/gui/main.h
rename to rosapps/applications/packmgr/gui/main.h
diff --git a/rosapps/packmgr/gui/packmgr.rbuild b/rosapps/applications/packmgr/gui/packmgr.rbuild
similarity index 100%
rename from rosapps/packmgr/gui/packmgr.rbuild
rename to rosapps/applications/packmgr/gui/packmgr.rbuild
diff --git a/rosapps/packmgr/gui/packmgr.rc b/rosapps/applications/packmgr/gui/packmgr.rc
similarity index 100%
rename from rosapps/packmgr/gui/packmgr.rc
rename to rosapps/applications/packmgr/gui/packmgr.rc
diff --git a/rosapps/packmgr/gui/res/blank.ico b/rosapps/applications/packmgr/gui/res/blank.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/blank.ico
rename to rosapps/applications/packmgr/gui/res/blank.ico
diff --git a/rosapps/packmgr/gui/res/development.ico b/rosapps/applications/packmgr/gui/res/development.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/development.ico
rename to rosapps/applications/packmgr/gui/res/development.ico
diff --git a/rosapps/packmgr/gui/res/games.ico b/rosapps/applications/packmgr/gui/res/games.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/games.ico
rename to rosapps/applications/packmgr/gui/res/games.ico
diff --git a/rosapps/packmgr/gui/res/graphics.ico b/rosapps/applications/packmgr/gui/res/graphics.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/graphics.ico
rename to rosapps/applications/packmgr/gui/res/graphics.ico
diff --git a/rosapps/packmgr/gui/res/inet.ico b/rosapps/applications/packmgr/gui/res/inet.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/inet.ico
rename to rosapps/applications/packmgr/gui/res/inet.ico
diff --git a/rosapps/packmgr/gui/res/install.ico b/rosapps/applications/packmgr/gui/res/install.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/install.ico
rename to rosapps/applications/packmgr/gui/res/install.ico
diff --git a/rosapps/packmgr/gui/res/installed.ico b/rosapps/applications/packmgr/gui/res/installed.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/installed.ico
rename to rosapps/applications/packmgr/gui/res/installed.ico
diff --git a/rosapps/packmgr/gui/res/installsource.ico b/rosapps/applications/packmgr/gui/res/installsource.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/installsource.ico
rename to rosapps/applications/packmgr/gui/res/installsource.ico
diff --git a/rosapps/packmgr/gui/res/multimedia.ico b/rosapps/applications/packmgr/gui/res/multimedia.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/multimedia.ico
rename to rosapps/applications/packmgr/gui/res/multimedia.ico
diff --git a/rosapps/packmgr/gui/res/office.ico b/rosapps/applications/packmgr/gui/res/office.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/office.ico
rename to rosapps/applications/packmgr/gui/res/office.ico
diff --git a/rosapps/packmgr/gui/res/others.ico b/rosapps/applications/packmgr/gui/res/others.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/others.ico
rename to rosapps/applications/packmgr/gui/res/others.ico
diff --git a/rosapps/packmgr/gui/res/packetmanager.ico b/rosapps/applications/packmgr/gui/res/packetmanager.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/packetmanager.ico
rename to rosapps/applications/packmgr/gui/res/packetmanager.ico
diff --git a/rosapps/packmgr/gui/res/toolbar.bmp b/rosapps/applications/packmgr/gui/res/toolbar.bmp
similarity index 100%
rename from rosapps/packmgr/gui/res/toolbar.bmp
rename to rosapps/applications/packmgr/gui/res/toolbar.bmp
diff --git a/rosapps/packmgr/gui/res/tools.ico b/rosapps/applications/packmgr/gui/res/tools.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/tools.ico
rename to rosapps/applications/packmgr/gui/res/tools.ico
diff --git a/rosapps/packmgr/gui/res/uninstall.ico b/rosapps/applications/packmgr/gui/res/uninstall.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/uninstall.ico
rename to rosapps/applications/packmgr/gui/res/uninstall.ico
diff --git a/rosapps/packmgr/gui/res/update.ico b/rosapps/applications/packmgr/gui/res/update.ico
similarity index 100%
rename from rosapps/packmgr/gui/res/update.ico
rename to rosapps/applications/packmgr/gui/res/update.ico
diff --git a/rosapps/packmgr/gui/resource.h b/rosapps/applications/packmgr/gui/resource.h
similarity index 100%
rename from rosapps/packmgr/gui/resource.h
rename to rosapps/applications/packmgr/gui/resource.h
diff --git a/rosapps/packmgr/lib/download.cpp b/rosapps/applications/packmgr/lib/download.cpp
similarity index 100%
rename from rosapps/packmgr/lib/download.cpp
rename to rosapps/applications/packmgr/lib/download.cpp
diff --git a/rosapps/packmgr/lib/error.h b/rosapps/applications/packmgr/lib/error.h
similarity index 100%
rename from rosapps/packmgr/lib/error.h
rename to rosapps/applications/packmgr/lib/error.h
diff --git a/rosapps/packmgr/lib/expat.h b/rosapps/applications/packmgr/lib/expat.h
similarity index 100%
rename from rosapps/packmgr/lib/expat.h
rename to rosapps/applications/packmgr/lib/expat.h
diff --git a/rosapps/packmgr/lib/functions.cpp b/rosapps/applications/packmgr/lib/functions.cpp
similarity index 100%
rename from rosapps/packmgr/lib/functions.cpp
rename to rosapps/applications/packmgr/lib/functions.cpp
diff --git a/rosapps/packmgr/lib/lang/cs-CZ.rc b/rosapps/applications/packmgr/lib/lang/cs-CZ.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/cs-CZ.rc
rename to rosapps/applications/packmgr/lib/lang/cs-CZ.rc
diff --git a/rosapps/packmgr/lib/lang/de-DE.rc b/rosapps/applications/packmgr/lib/lang/de-DE.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/de-DE.rc
rename to rosapps/applications/packmgr/lib/lang/de-DE.rc
diff --git a/rosapps/packmgr/lib/lang/en-US.rc b/rosapps/applications/packmgr/lib/lang/en-US.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/en-US.rc
rename to rosapps/applications/packmgr/lib/lang/en-US.rc
diff --git a/rosapps/packmgr/lib/lang/es-ES.rc b/rosapps/applications/packmgr/lib/lang/es-ES.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/es-ES.rc
rename to rosapps/applications/packmgr/lib/lang/es-ES.rc
diff --git a/rosapps/packmgr/lib/lang/fr-FR.rc b/rosapps/applications/packmgr/lib/lang/fr-FR.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/fr-FR.rc
rename to rosapps/applications/packmgr/lib/lang/fr-FR.rc
diff --git a/rosapps/packmgr/lib/lang/pl-PL.rc b/rosapps/applications/packmgr/lib/lang/pl-PL.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/pl-PL.rc
rename to rosapps/applications/packmgr/lib/lang/pl-PL.rc
diff --git a/rosapps/packmgr/lib/lang/ru-RU.rc b/rosapps/applications/packmgr/lib/lang/ru-RU.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/ru-RU.rc
rename to rosapps/applications/packmgr/lib/lang/ru-RU.rc
diff --git a/rosapps/packmgr/lib/lang/uk-UA.rc b/rosapps/applications/packmgr/lib/lang/uk-UA.rc
similarity index 100%
rename from rosapps/packmgr/lib/lang/uk-UA.rc
rename to rosapps/applications/packmgr/lib/lang/uk-UA.rc
diff --git a/rosapps/packmgr/lib/log.cpp b/rosapps/applications/packmgr/lib/log.cpp
similarity index 100%
rename from rosapps/packmgr/lib/log.cpp
rename to rosapps/applications/packmgr/lib/log.cpp
diff --git a/rosapps/packmgr/lib/log.h b/rosapps/applications/packmgr/lib/log.h
similarity index 100%
rename from rosapps/packmgr/lib/log.h
rename to rosapps/applications/packmgr/lib/log.h
diff --git a/rosapps/packmgr/lib/main.cpp b/rosapps/applications/packmgr/lib/main.cpp
similarity index 100%
rename from rosapps/packmgr/lib/main.cpp
rename to rosapps/applications/packmgr/lib/main.cpp
diff --git a/rosapps/packmgr/lib/options.cpp b/rosapps/applications/packmgr/lib/options.cpp
similarity index 100%
rename from rosapps/packmgr/lib/options.cpp
rename to rosapps/applications/packmgr/lib/options.cpp
diff --git a/rosapps/packmgr/lib/options.xml b/rosapps/applications/packmgr/lib/options.xml
similarity index 100%
rename from rosapps/packmgr/lib/options.xml
rename to rosapps/applications/packmgr/lib/options.xml
diff --git a/rosapps/packmgr/lib/package.cpp b/rosapps/applications/packmgr/lib/package.cpp
similarity index 100%
rename from rosapps/packmgr/lib/package.cpp
rename to rosapps/applications/packmgr/lib/package.cpp
diff --git a/rosapps/packmgr/lib/package.def b/rosapps/applications/packmgr/lib/package.def
similarity index 100%
rename from rosapps/packmgr/lib/package.def
rename to rosapps/applications/packmgr/lib/package.def
diff --git a/rosapps/packmgr/lib/package.h b/rosapps/applications/packmgr/lib/package.h
similarity index 100%
rename from rosapps/packmgr/lib/package.h
rename to rosapps/applications/packmgr/lib/package.h
diff --git a/rosapps/packmgr/lib/package.hpp b/rosapps/applications/packmgr/lib/package.hpp
similarity index 100%
rename from rosapps/packmgr/lib/package.hpp
rename to rosapps/applications/packmgr/lib/package.hpp
diff --git a/rosapps/packmgr/lib/package.rbuild b/rosapps/applications/packmgr/lib/package.rbuild
similarity index 100%
rename from rosapps/packmgr/lib/package.rbuild
rename to rosapps/applications/packmgr/lib/package.rbuild
diff --git a/rosapps/packmgr/lib/package.rc b/rosapps/applications/packmgr/lib/package.rc
similarity index 100%
rename from rosapps/packmgr/lib/package.rc
rename to rosapps/applications/packmgr/lib/package.rc
diff --git a/rosapps/packmgr/lib/script.cpp b/rosapps/applications/packmgr/lib/script.cpp
similarity index 100%
rename from rosapps/packmgr/lib/script.cpp
rename to rosapps/applications/packmgr/lib/script.cpp
diff --git a/rosapps/packmgr/lib/script.h b/rosapps/applications/packmgr/lib/script.h
similarity index 100%
rename from rosapps/packmgr/lib/script.h
rename to rosapps/applications/packmgr/lib/script.h
diff --git a/rosapps/packmgr/lib/tree.cpp b/rosapps/applications/packmgr/lib/tree.cpp
similarity index 100%
rename from rosapps/packmgr/lib/tree.cpp
rename to rosapps/applications/packmgr/lib/tree.cpp
diff --git a/rosapps/packmgr/tree/7zip.inst.rps b/rosapps/applications/packmgr/tree/7zip.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/7zip.inst.rps
rename to rosapps/applications/packmgr/tree/7zip.inst.rps
diff --git a/rosapps/packmgr/tree/7zip.xml b/rosapps/applications/packmgr/tree/7zip.xml
similarity index 100%
rename from rosapps/packmgr/tree/7zip.xml
rename to rosapps/applications/packmgr/tree/7zip.xml
diff --git a/rosapps/packmgr/tree/abiword.inst.rps b/rosapps/applications/packmgr/tree/abiword.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/abiword.inst.rps
rename to rosapps/applications/packmgr/tree/abiword.inst.rps
diff --git a/rosapps/packmgr/tree/abiword.xml b/rosapps/applications/packmgr/tree/abiword.xml
similarity index 100%
rename from rosapps/packmgr/tree/abiword.xml
rename to rosapps/applications/packmgr/tree/abiword.xml
diff --git a/rosapps/packmgr/tree/firefox.inst.rps b/rosapps/applications/packmgr/tree/firefox.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/firefox.inst.rps
rename to rosapps/applications/packmgr/tree/firefox.inst.rps
diff --git a/rosapps/packmgr/tree/firefox.xml b/rosapps/applications/packmgr/tree/firefox.xml
similarity index 100%
rename from rosapps/packmgr/tree/firefox.xml
rename to rosapps/applications/packmgr/tree/firefox.xml
diff --git a/rosapps/packmgr/tree/irfanview.inst.rps b/rosapps/applications/packmgr/tree/irfanview.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/irfanview.inst.rps
rename to rosapps/applications/packmgr/tree/irfanview.inst.rps
diff --git a/rosapps/packmgr/tree/irfanview.xml b/rosapps/applications/packmgr/tree/irfanview.xml
similarity index 100%
rename from rosapps/packmgr/tree/irfanview.xml
rename to rosapps/applications/packmgr/tree/irfanview.xml
diff --git a/rosapps/packmgr/tree/mplayer.inst.rps b/rosapps/applications/packmgr/tree/mplayer.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/mplayer.inst.rps
rename to rosapps/applications/packmgr/tree/mplayer.inst.rps
diff --git a/rosapps/packmgr/tree/mplayer.xml b/rosapps/applications/packmgr/tree/mplayer.xml
similarity index 100%
rename from rosapps/packmgr/tree/mplayer.xml
rename to rosapps/applications/packmgr/tree/mplayer.xml
diff --git a/rosapps/packmgr/tree/openoffice.inst.rps b/rosapps/applications/packmgr/tree/openoffice.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/openoffice.inst.rps
rename to rosapps/applications/packmgr/tree/openoffice.inst.rps
diff --git a/rosapps/packmgr/tree/openoffice.xml b/rosapps/applications/packmgr/tree/openoffice.xml
similarity index 100%
rename from rosapps/packmgr/tree/openoffice.xml
rename to rosapps/applications/packmgr/tree/openoffice.xml
diff --git a/rosapps/packmgr/tree/putty.inst.rps b/rosapps/applications/packmgr/tree/putty.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/putty.inst.rps
rename to rosapps/applications/packmgr/tree/putty.inst.rps
diff --git a/rosapps/packmgr/tree/putty.xml b/rosapps/applications/packmgr/tree/putty.xml
similarity index 100%
rename from rosapps/packmgr/tree/putty.xml
rename to rosapps/applications/packmgr/tree/putty.xml
diff --git a/rosapps/packmgr/tree/rosbe.inst.rps b/rosapps/applications/packmgr/tree/rosbe.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/rosbe.inst.rps
rename to rosapps/applications/packmgr/tree/rosbe.inst.rps
diff --git a/rosapps/packmgr/tree/rosbe.xml b/rosapps/applications/packmgr/tree/rosbe.xml
similarity index 100%
rename from rosapps/packmgr/tree/rosbe.xml
rename to rosapps/applications/packmgr/tree/rosbe.xml
diff --git a/rosapps/packmgr/tree/samba-tng.inst.rps b/rosapps/applications/packmgr/tree/samba-tng.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/samba-tng.inst.rps
rename to rosapps/applications/packmgr/tree/samba-tng.inst.rps
diff --git a/rosapps/packmgr/tree/samba-tng.xml b/rosapps/applications/packmgr/tree/samba-tng.xml
similarity index 100%
rename from rosapps/packmgr/tree/samba-tng.xml
rename to rosapps/applications/packmgr/tree/samba-tng.xml
diff --git a/rosapps/packmgr/tree/tiny.inst.rps b/rosapps/applications/packmgr/tree/tiny.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/tiny.inst.rps
rename to rosapps/applications/packmgr/tree/tiny.inst.rps
diff --git a/rosapps/packmgr/tree/tiny.xml b/rosapps/applications/packmgr/tree/tiny.xml
similarity index 100%
rename from rosapps/packmgr/tree/tiny.xml
rename to rosapps/applications/packmgr/tree/tiny.xml
diff --git a/rosapps/packmgr/tree/tree.xml b/rosapps/applications/packmgr/tree/tree.xml
similarity index 100%
rename from rosapps/packmgr/tree/tree.xml
rename to rosapps/applications/packmgr/tree/tree.xml
diff --git a/rosapps/packmgr/tree/tree_bare.xml b/rosapps/applications/packmgr/tree/tree_bare.xml
similarity index 100%
rename from rosapps/packmgr/tree/tree_bare.xml
rename to rosapps/applications/packmgr/tree/tree_bare.xml
diff --git a/rosapps/packmgr/tree/tree_withsubs.xml b/rosapps/applications/packmgr/tree/tree_withsubs.xml
similarity index 100%
rename from rosapps/packmgr/tree/tree_withsubs.xml
rename to rosapps/applications/packmgr/tree/tree_withsubs.xml
diff --git a/rosapps/packmgr/tree/tuxpaint.inst.rps b/rosapps/applications/packmgr/tree/tuxpaint.inst.rps
similarity index 100%
rename from rosapps/packmgr/tree/tuxpaint.inst.rps
rename to rosapps/applications/packmgr/tree/tuxpaint.inst.rps
diff --git a/rosapps/packmgr/tree/tuxpaint.xml b/rosapps/applications/packmgr/tree/tuxpaint.xml
similarity index 100%
rename from rosapps/packmgr/tree/tuxpaint.xml
rename to rosapps/applications/packmgr/tree/tuxpaint.xml
diff --git a/rosapps/roshttpd/common/list.cpp b/rosapps/applications/roshttpd/common/list.cpp
similarity index 100%
rename from rosapps/roshttpd/common/list.cpp
rename to rosapps/applications/roshttpd/common/list.cpp
diff --git a/rosapps/roshttpd/common/roshttpd.rc b/rosapps/applications/roshttpd/common/roshttpd.rc
similarity index 100%
rename from rosapps/roshttpd/common/roshttpd.rc
rename to rosapps/applications/roshttpd/common/roshttpd.rc
diff --git a/rosapps/roshttpd/common/socket.cpp b/rosapps/applications/roshttpd/common/socket.cpp
similarity index 100%
rename from rosapps/roshttpd/common/socket.cpp
rename to rosapps/applications/roshttpd/common/socket.cpp
diff --git a/rosapps/roshttpd/common/thread.cpp b/rosapps/applications/roshttpd/common/thread.cpp
similarity index 100%
rename from rosapps/roshttpd/common/thread.cpp
rename to rosapps/applications/roshttpd/common/thread.cpp
diff --git a/rosapps/roshttpd/config.cpp b/rosapps/applications/roshttpd/config.cpp
similarity index 100%
rename from rosapps/roshttpd/config.cpp
rename to rosapps/applications/roshttpd/config.cpp
diff --git a/rosapps/roshttpd/error.cpp b/rosapps/applications/roshttpd/error.cpp
similarity index 100%
rename from rosapps/roshttpd/error.cpp
rename to rosapps/applications/roshttpd/error.cpp
diff --git a/rosapps/roshttpd/http.cpp b/rosapps/applications/roshttpd/http.cpp
similarity index 100%
rename from rosapps/roshttpd/http.cpp
rename to rosapps/applications/roshttpd/http.cpp
diff --git a/rosapps/roshttpd/httpd.cpp b/rosapps/applications/roshttpd/httpd.cpp
similarity index 100%
rename from rosapps/roshttpd/httpd.cpp
rename to rosapps/applications/roshttpd/httpd.cpp
diff --git a/rosapps/roshttpd/include/config.h b/rosapps/applications/roshttpd/include/config.h
similarity index 100%
rename from rosapps/roshttpd/include/config.h
rename to rosapps/applications/roshttpd/include/config.h
diff --git a/rosapps/roshttpd/include/debug.h b/rosapps/applications/roshttpd/include/debug.h
similarity index 100%
rename from rosapps/roshttpd/include/debug.h
rename to rosapps/applications/roshttpd/include/debug.h
diff --git a/rosapps/roshttpd/include/error.h b/rosapps/applications/roshttpd/include/error.h
similarity index 100%
rename from rosapps/roshttpd/include/error.h
rename to rosapps/applications/roshttpd/include/error.h
diff --git a/rosapps/roshttpd/include/http.h b/rosapps/applications/roshttpd/include/http.h
similarity index 100%
rename from rosapps/roshttpd/include/http.h
rename to rosapps/applications/roshttpd/include/http.h
diff --git a/rosapps/roshttpd/include/httpd.h b/rosapps/applications/roshttpd/include/httpd.h
similarity index 100%
rename from rosapps/roshttpd/include/httpd.h
rename to rosapps/applications/roshttpd/include/httpd.h
diff --git a/rosapps/roshttpd/include/iterator.h b/rosapps/applications/roshttpd/include/iterator.h
similarity index 100%
rename from rosapps/roshttpd/include/iterator.h
rename to rosapps/applications/roshttpd/include/iterator.h
diff --git a/rosapps/roshttpd/include/list.h b/rosapps/applications/roshttpd/include/list.h
similarity index 100%
rename from rosapps/roshttpd/include/list.h
rename to rosapps/applications/roshttpd/include/list.h
diff --git a/rosapps/roshttpd/include/socket.h b/rosapps/applications/roshttpd/include/socket.h
similarity index 100%
rename from rosapps/roshttpd/include/socket.h
rename to rosapps/applications/roshttpd/include/socket.h
diff --git a/rosapps/roshttpd/include/thread.h b/rosapps/applications/roshttpd/include/thread.h
similarity index 100%
rename from rosapps/roshttpd/include/thread.h
rename to rosapps/applications/roshttpd/include/thread.h
diff --git a/rosapps/roshttpd/roshttpd.cpp b/rosapps/applications/roshttpd/roshttpd.cpp
similarity index 100%
rename from rosapps/roshttpd/roshttpd.cpp
rename to rosapps/applications/roshttpd/roshttpd.cpp
diff --git a/rosapps/roshttpd/roshttpd.rbuild b/rosapps/applications/roshttpd/roshttpd.rbuild
similarity index 100%
rename from rosapps/roshttpd/roshttpd.rbuild
rename to rosapps/applications/roshttpd/roshttpd.rbuild
diff --git a/rosapps/screenshot/screenshot.c b/rosapps/applications/screenshot/screenshot.c
similarity index 100%
rename from rosapps/screenshot/screenshot.c
rename to rosapps/applications/screenshot/screenshot.c
diff --git a/rosapps/screenshot/screenshot.h b/rosapps/applications/screenshot/screenshot.h
similarity index 100%
rename from rosapps/screenshot/screenshot.h
rename to rosapps/applications/screenshot/screenshot.h
diff --git a/rosapps/screenshot/screenshot.rbuild b/rosapps/applications/screenshot/screenshot.rbuild
similarity index 100%
rename from rosapps/screenshot/screenshot.rbuild
rename to rosapps/applications/screenshot/screenshot.rbuild
diff --git a/rosapps/screenshot/screenshot.rc b/rosapps/applications/screenshot/screenshot.rc
similarity index 100%
rename from rosapps/screenshot/screenshot.rc
rename to rosapps/applications/screenshot/screenshot.rc
diff --git a/rosapps/screenshot/snap.ico b/rosapps/applications/screenshot/snap.ico
similarity index 100%
rename from rosapps/screenshot/snap.ico
rename to rosapps/applications/screenshot/snap.ico
diff --git a/rosapps/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c
similarity index 100%
rename from rosapps/sysutils/chkdsk/chkdsk.c
rename to rosapps/applications/sysutils/chkdsk/chkdsk.c
diff --git a/rosapps/sysutils/chkdsk/chkdsk.rbuild b/rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
similarity index 100%
rename from rosapps/sysutils/chkdsk/chkdsk.rbuild
rename to rosapps/applications/sysutils/chkdsk/chkdsk.rbuild
diff --git a/rosapps/sysutils/chkdsk/chkdsk.rc b/rosapps/applications/sysutils/chkdsk/chkdsk.rc
similarity index 100%
rename from rosapps/sysutils/chkdsk/chkdsk.rc
rename to rosapps/applications/sysutils/chkdsk/chkdsk.rc
diff --git a/rosapps/sysutils/chklib/chklib.c b/rosapps/applications/sysutils/chklib/chklib.c
similarity index 100%
rename from rosapps/sysutils/chklib/chklib.c
rename to rosapps/applications/sysutils/chklib/chklib.c
diff --git a/rosapps/sysutils/chklib/chklib.rbuild b/rosapps/applications/sysutils/chklib/chklib.rbuild
similarity index 100%
rename from rosapps/sysutils/chklib/chklib.rbuild
rename to rosapps/applications/sysutils/chklib/chklib.rbuild
diff --git a/rosapps/sysutils/chklib/chklib.rc b/rosapps/applications/sysutils/chklib/chklib.rc
similarity index 100%
rename from rosapps/sysutils/chklib/chklib.rc
rename to rosapps/applications/sysutils/chklib/chklib.rc
diff --git a/rosapps/sysutils/config.h b/rosapps/applications/sysutils/config.h
similarity index 100%
rename from rosapps/sysutils/config.h
rename to rosapps/applications/sysutils/config.h
diff --git a/rosapps/sysutils/ctm/ctm.c b/rosapps/applications/sysutils/ctm/ctm.c
similarity index 100%
rename from rosapps/sysutils/ctm/ctm.c
rename to rosapps/applications/sysutils/ctm/ctm.c
diff --git a/rosapps/sysutils/ctm/ctm.h b/rosapps/applications/sysutils/ctm/ctm.h
similarity index 100%
rename from rosapps/sysutils/ctm/ctm.h
rename to rosapps/applications/sysutils/ctm/ctm.h
diff --git a/rosapps/sysutils/ctm/ctm.rbuild b/rosapps/applications/sysutils/ctm/ctm.rbuild
similarity index 100%
rename from rosapps/sysutils/ctm/ctm.rbuild
rename to rosapps/applications/sysutils/ctm/ctm.rbuild
diff --git a/rosapps/sysutils/ctm/ctm.rc b/rosapps/applications/sysutils/ctm/ctm.rc
similarity index 100%
rename from rosapps/sysutils/ctm/ctm.rc
rename to rosapps/applications/sysutils/ctm/ctm.rc
diff --git a/rosapps/sysutils/ctm/lang/de-DE.rc b/rosapps/applications/sysutils/ctm/lang/de-DE.rc
similarity index 100%
rename from rosapps/sysutils/ctm/lang/de-DE.rc
rename to rosapps/applications/sysutils/ctm/lang/de-DE.rc
diff --git a/rosapps/sysutils/ctm/lang/el-GR.rc b/rosapps/applications/sysutils/ctm/lang/el-GR.rc
similarity index 100%
rename from rosapps/sysutils/ctm/lang/el-GR.rc
rename to rosapps/applications/sysutils/ctm/lang/el-GR.rc
diff --git a/rosapps/sysutils/ctm/lang/en-US.rc b/rosapps/applications/sysutils/ctm/lang/en-US.rc
similarity index 100%
rename from rosapps/sysutils/ctm/lang/en-US.rc
rename to rosapps/applications/sysutils/ctm/lang/en-US.rc
diff --git a/rosapps/sysutils/ctm/lang/fr-FR.rc b/rosapps/applications/sysutils/ctm/lang/fr-FR.rc
similarity index 100%
rename from rosapps/sysutils/ctm/lang/fr-FR.rc
rename to rosapps/applications/sysutils/ctm/lang/fr-FR.rc
diff --git a/rosapps/sysutils/ctm/lang/ru-RU.rc b/rosapps/applications/sysutils/ctm/lang/ru-RU.rc
similarity index 100%
rename from rosapps/sysutils/ctm/lang/ru-RU.rc
rename to rosapps/applications/sysutils/ctm/lang/ru-RU.rc
diff --git a/rosapps/sysutils/ctm/lang/uk-UA.rc b/rosapps/applications/sysutils/ctm/lang/uk-UA.rc
similarity index 100%
rename from rosapps/sysutils/ctm/lang/uk-UA.rc
rename to rosapps/applications/sysutils/ctm/lang/uk-UA.rc
diff --git a/rosapps/sysutils/ctm/resource.h b/rosapps/applications/sysutils/ctm/resource.h
similarity index 100%
rename from rosapps/sysutils/ctm/resource.h
rename to rosapps/applications/sysutils/ctm/resource.h
diff --git a/rosapps/sysutils/dosfsck/.cvsignore b/rosapps/applications/sysutils/dosfsck/.cvsignore
similarity index 100%
rename from rosapps/sysutils/dosfsck/.cvsignore
rename to rosapps/applications/sysutils/dosfsck/.cvsignore
diff --git a/rosapps/sysutils/dosfsck/CHANGES b/rosapps/applications/sysutils/dosfsck/CHANGES
similarity index 100%
rename from rosapps/sysutils/dosfsck/CHANGES
rename to rosapps/applications/sysutils/dosfsck/CHANGES
diff --git a/rosapps/sysutils/dosfsck/COPYING b/rosapps/applications/sysutils/dosfsck/COPYING
similarity index 100%
rename from rosapps/sysutils/dosfsck/COPYING
rename to rosapps/applications/sysutils/dosfsck/COPYING
diff --git a/rosapps/sysutils/dosfsck/Makefile b/rosapps/applications/sysutils/dosfsck/Makefile
similarity index 100%
rename from rosapps/sysutils/dosfsck/Makefile
rename to rosapps/applications/sysutils/dosfsck/Makefile
diff --git a/rosapps/sysutils/dosfsck/README b/rosapps/applications/sysutils/dosfsck/README
similarity index 100%
rename from rosapps/sysutils/dosfsck/README
rename to rosapps/applications/sysutils/dosfsck/README
diff --git a/rosapps/sysutils/dosfsck/boot.c b/rosapps/applications/sysutils/dosfsck/boot.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/boot.c
rename to rosapps/applications/sysutils/dosfsck/boot.c
diff --git a/rosapps/sysutils/dosfsck/boot.h b/rosapps/applications/sysutils/dosfsck/boot.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/boot.h
rename to rosapps/applications/sysutils/dosfsck/boot.h
diff --git a/rosapps/sysutils/dosfsck/byteorder.h b/rosapps/applications/sysutils/dosfsck/byteorder.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/byteorder.h
rename to rosapps/applications/sysutils/dosfsck/byteorder.h
diff --git a/rosapps/sysutils/dosfsck/byteswap.h b/rosapps/applications/sysutils/dosfsck/byteswap.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/byteswap.h
rename to rosapps/applications/sysutils/dosfsck/byteswap.h
diff --git a/rosapps/sysutils/dosfsck/byteswap1.h b/rosapps/applications/sysutils/dosfsck/byteswap1.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/byteswap1.h
rename to rosapps/applications/sysutils/dosfsck/byteswap1.h
diff --git a/rosapps/sysutils/dosfsck/check.c b/rosapps/applications/sysutils/dosfsck/check.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/check.c
rename to rosapps/applications/sysutils/dosfsck/check.c
diff --git a/rosapps/sysutils/dosfsck/check.h b/rosapps/applications/sysutils/dosfsck/check.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/check.h
rename to rosapps/applications/sysutils/dosfsck/check.h
diff --git a/rosapps/sysutils/dosfsck/common.c b/rosapps/applications/sysutils/dosfsck/common.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/common.c
rename to rosapps/applications/sysutils/dosfsck/common.c
diff --git a/rosapps/sysutils/dosfsck/common.h b/rosapps/applications/sysutils/dosfsck/common.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/common.h
rename to rosapps/applications/sysutils/dosfsck/common.h
diff --git a/rosapps/sysutils/dosfsck/compiler.h b/rosapps/applications/sysutils/dosfsck/compiler.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/compiler.h
rename to rosapps/applications/sysutils/dosfsck/compiler.h
diff --git a/rosapps/sysutils/dosfsck/dosfsck.8 b/rosapps/applications/sysutils/dosfsck/dosfsck.8
similarity index 100%
rename from rosapps/sysutils/dosfsck/dosfsck.8
rename to rosapps/applications/sysutils/dosfsck/dosfsck.8
diff --git a/rosapps/sysutils/dosfsck/dosfsck.c b/rosapps/applications/sysutils/dosfsck/dosfsck.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/dosfsck.c
rename to rosapps/applications/sysutils/dosfsck/dosfsck.c
diff --git a/rosapps/sysutils/dosfsck/dosfsck.h b/rosapps/applications/sysutils/dosfsck/dosfsck.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/dosfsck.h
rename to rosapps/applications/sysutils/dosfsck/dosfsck.h
diff --git a/rosapps/sysutils/dosfsck/fat.c b/rosapps/applications/sysutils/dosfsck/fat.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/fat.c
rename to rosapps/applications/sysutils/dosfsck/fat.c
diff --git a/rosapps/sysutils/dosfsck/fat.h b/rosapps/applications/sysutils/dosfsck/fat.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/fat.h
rename to rosapps/applications/sysutils/dosfsck/fat.h
diff --git a/rosapps/sysutils/dosfsck/file.c b/rosapps/applications/sysutils/dosfsck/file.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/file.c
rename to rosapps/applications/sysutils/dosfsck/file.c
diff --git a/rosapps/sysutils/dosfsck/file.h b/rosapps/applications/sysutils/dosfsck/file.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/file.h
rename to rosapps/applications/sysutils/dosfsck/file.h
diff --git a/rosapps/sysutils/dosfsck/io.c b/rosapps/applications/sysutils/dosfsck/io.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/io.c
rename to rosapps/applications/sysutils/dosfsck/io.c
diff --git a/rosapps/sysutils/dosfsck/io.h b/rosapps/applications/sysutils/dosfsck/io.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/io.h
rename to rosapps/applications/sysutils/dosfsck/io.h
diff --git a/rosapps/sysutils/dosfsck/lfn.c b/rosapps/applications/sysutils/dosfsck/lfn.c
similarity index 100%
rename from rosapps/sysutils/dosfsck/lfn.c
rename to rosapps/applications/sysutils/dosfsck/lfn.c
diff --git a/rosapps/sysutils/dosfsck/lfn.h b/rosapps/applications/sysutils/dosfsck/lfn.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/lfn.h
rename to rosapps/applications/sysutils/dosfsck/lfn.h
diff --git a/rosapps/sysutils/dosfsck/msdos_fs.h b/rosapps/applications/sysutils/dosfsck/msdos_fs.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/msdos_fs.h
rename to rosapps/applications/sysutils/dosfsck/msdos_fs.h
diff --git a/rosapps/sysutils/dosfsck/swab.h b/rosapps/applications/sysutils/dosfsck/swab.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/swab.h
rename to rosapps/applications/sysutils/dosfsck/swab.h
diff --git a/rosapps/sysutils/dosfsck/version.h b/rosapps/applications/sysutils/dosfsck/version.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/version.h
rename to rosapps/applications/sysutils/dosfsck/version.h
diff --git a/rosapps/sysutils/dosfsck/vfat.h b/rosapps/applications/sysutils/dosfsck/vfat.h
similarity index 100%
rename from rosapps/sysutils/dosfsck/vfat.h
rename to rosapps/applications/sysutils/dosfsck/vfat.h
diff --git a/rosapps/sysutils/fmifs.h b/rosapps/applications/sysutils/fmifs.h
similarity index 100%
rename from rosapps/sysutils/fmifs.h
rename to rosapps/applications/sysutils/fmifs.h
diff --git a/rosapps/sysutils/kill/kill.c b/rosapps/applications/sysutils/kill/kill.c
similarity index 100%
rename from rosapps/sysutils/kill/kill.c
rename to rosapps/applications/sysutils/kill/kill.c
diff --git a/rosapps/sysutils/kill/kill.rbuild b/rosapps/applications/sysutils/kill/kill.rbuild
similarity index 100%
rename from rosapps/sysutils/kill/kill.rbuild
rename to rosapps/applications/sysutils/kill/kill.rbuild
diff --git a/rosapps/sysutils/kill/kill.rc b/rosapps/applications/sysutils/kill/kill.rc
similarity index 100%
rename from rosapps/sysutils/kill/kill.rc
rename to rosapps/applications/sysutils/kill/kill.rc
diff --git a/rosapps/sysutils/lib/lib.rbuild b/rosapps/applications/sysutils/lib/lib.rbuild
similarity index 100%
rename from rosapps/sysutils/lib/lib.rbuild
rename to rosapps/applications/sysutils/lib/lib.rbuild
diff --git a/rosapps/sysutils/lib/win32err.c b/rosapps/applications/sysutils/lib/win32err.c
similarity index 100%
rename from rosapps/sysutils/lib/win32err.c
rename to rosapps/applications/sysutils/lib/win32err.c
diff --git a/rosapps/sysutils/lsdd/lsdd.c b/rosapps/applications/sysutils/lsdd/lsdd.c
similarity index 100%
rename from rosapps/sysutils/lsdd/lsdd.c
rename to rosapps/applications/sysutils/lsdd/lsdd.c
diff --git a/rosapps/sysutils/lsdd/lsdd.rbuild b/rosapps/applications/sysutils/lsdd/lsdd.rbuild
similarity index 100%
rename from rosapps/sysutils/lsdd/lsdd.rbuild
rename to rosapps/applications/sysutils/lsdd/lsdd.rbuild
diff --git a/rosapps/sysutils/lsdd/lsdd.rc b/rosapps/applications/sysutils/lsdd/lsdd.rc
similarity index 100%
rename from rosapps/sysutils/lsdd/lsdd.rc
rename to rosapps/applications/sysutils/lsdd/lsdd.rc
diff --git a/rosapps/sysutils/man/man.c b/rosapps/applications/sysutils/man/man.c
similarity index 100%
rename from rosapps/sysutils/man/man.c
rename to rosapps/applications/sysutils/man/man.c
diff --git a/rosapps/sysutils/man/man.cmd b/rosapps/applications/sysutils/man/man.cmd
similarity index 100%
rename from rosapps/sysutils/man/man.cmd
rename to rosapps/applications/sysutils/man/man.cmd
diff --git a/rosapps/sysutils/man/man.rbuild b/rosapps/applications/sysutils/man/man.rbuild
similarity index 100%
rename from rosapps/sysutils/man/man.rbuild
rename to rosapps/applications/sysutils/man/man.rbuild
diff --git a/rosapps/sysutils/man/man/2/chkdsk.man b/rosapps/applications/sysutils/man/man/2/chkdsk.man
similarity index 100%
rename from rosapps/sysutils/man/man/2/chkdsk.man
rename to rosapps/applications/sysutils/man/man/2/chkdsk.man
diff --git a/rosapps/sysutils/man/man/2/chklib.man b/rosapps/applications/sysutils/man/man/2/chklib.man
similarity index 100%
rename from rosapps/sysutils/man/man/2/chklib.man
rename to rosapps/applications/sysutils/man/man/2/chklib.man
diff --git a/rosapps/sysutils/man/man/2/format.man b/rosapps/applications/sysutils/man/man/2/format.man
similarity index 100%
rename from rosapps/sysutils/man/man/2/format.man
rename to rosapps/applications/sysutils/man/man/2/format.man
diff --git a/rosapps/sysutils/man/man/2/man.man b/rosapps/applications/sysutils/man/man/2/man.man
similarity index 100%
rename from rosapps/sysutils/man/man/2/man.man
rename to rosapps/applications/sysutils/man/man/2/man.man
diff --git a/rosapps/sysutils/man/man/2/ping.man b/rosapps/applications/sysutils/man/man/2/ping.man
similarity index 100%
rename from rosapps/sysutils/man/man/2/ping.man
rename to rosapps/applications/sysutils/man/man/2/ping.man
diff --git a/rosapps/sysutils/man/man/3/taskmgr.man b/rosapps/applications/sysutils/man/man/3/taskmgr.man
similarity index 100%
rename from rosapps/sysutils/man/man/3/taskmgr.man
rename to rosapps/applications/sysutils/man/man/3/taskmgr.man
diff --git a/rosapps/sysutils/man/man/foo.1 b/rosapps/applications/sysutils/man/man/foo.1
similarity index 100%
rename from rosapps/sysutils/man/man/foo.1
rename to rosapps/applications/sysutils/man/man/foo.1
diff --git a/rosapps/sysutils/man/man/man.1 b/rosapps/applications/sysutils/man/man/man.1
similarity index 100%
rename from rosapps/sysutils/man/man/man.1
rename to rosapps/applications/sysutils/man/man/man.1
diff --git a/rosapps/sysutils/man/used_tags.txt b/rosapps/applications/sysutils/man/used_tags.txt
similarity index 100%
rename from rosapps/sysutils/man/used_tags.txt
rename to rosapps/applications/sysutils/man/used_tags.txt
diff --git a/rosapps/sysutils/mkdosfs/.cvsignore b/rosapps/applications/sysutils/mkdosfs/.cvsignore
similarity index 100%
rename from rosapps/sysutils/mkdosfs/.cvsignore
rename to rosapps/applications/sysutils/mkdosfs/.cvsignore
diff --git a/rosapps/sysutils/mkdosfs/ANNOUNCE b/rosapps/applications/sysutils/mkdosfs/ANNOUNCE
similarity index 100%
rename from rosapps/sysutils/mkdosfs/ANNOUNCE
rename to rosapps/applications/sysutils/mkdosfs/ANNOUNCE
diff --git a/rosapps/sysutils/mkdosfs/COPYING b/rosapps/applications/sysutils/mkdosfs/COPYING
similarity index 100%
rename from rosapps/sysutils/mkdosfs/COPYING
rename to rosapps/applications/sysutils/mkdosfs/COPYING
diff --git a/rosapps/sysutils/mkdosfs/ChangeLog b/rosapps/applications/sysutils/mkdosfs/ChangeLog
similarity index 100%
rename from rosapps/sysutils/mkdosfs/ChangeLog
rename to rosapps/applications/sysutils/mkdosfs/ChangeLog
diff --git a/rosapps/sysutils/mkdosfs/Makefile b/rosapps/applications/sysutils/mkdosfs/Makefile
similarity index 100%
rename from rosapps/sysutils/mkdosfs/Makefile
rename to rosapps/applications/sysutils/mkdosfs/Makefile
diff --git a/rosapps/sysutils/mkdosfs/README b/rosapps/applications/sysutils/mkdosfs/README
similarity index 100%
rename from rosapps/sysutils/mkdosfs/README
rename to rosapps/applications/sysutils/mkdosfs/README
diff --git a/rosapps/sysutils/mkdosfs/getopt.c b/rosapps/applications/sysutils/mkdosfs/getopt.c
similarity index 100%
rename from rosapps/sysutils/mkdosfs/getopt.c
rename to rosapps/applications/sysutils/mkdosfs/getopt.c
diff --git a/rosapps/sysutils/mkdosfs/mkdosfs-ygg-0.3b.lsm b/rosapps/applications/sysutils/mkdosfs/mkdosfs-ygg-0.3b.lsm
similarity index 100%
rename from rosapps/sysutils/mkdosfs/mkdosfs-ygg-0.3b.lsm
rename to rosapps/applications/sysutils/mkdosfs/mkdosfs-ygg-0.3b.lsm
diff --git a/rosapps/sysutils/mkdosfs/mkdosfs.8 b/rosapps/applications/sysutils/mkdosfs/mkdosfs.8
similarity index 100%
rename from rosapps/sysutils/mkdosfs/mkdosfs.8
rename to rosapps/applications/sysutils/mkdosfs/mkdosfs.8
diff --git a/rosapps/sysutils/mkdosfs/mkdosfs.c b/rosapps/applications/sysutils/mkdosfs/mkdosfs.c
similarity index 100%
rename from rosapps/sysutils/mkdosfs/mkdosfs.c
rename to rosapps/applications/sysutils/mkdosfs/mkdosfs.c
diff --git a/rosapps/sysutils/mkdosfs/mkdosfs.dsp b/rosapps/applications/sysutils/mkdosfs/mkdosfs.dsp
similarity index 100%
rename from rosapps/sysutils/mkdosfs/mkdosfs.dsp
rename to rosapps/applications/sysutils/mkdosfs/mkdosfs.dsp
diff --git a/rosapps/sysutils/mkdosfs/mkdosfs.dsw b/rosapps/applications/sysutils/mkdosfs/mkdosfs.dsw
similarity index 100%
rename from rosapps/sysutils/mkdosfs/mkdosfs.dsw
rename to rosapps/applications/sysutils/mkdosfs/mkdosfs.dsw
diff --git a/rosapps/sysutils/mkdosfs/mkdosfs.plg b/rosapps/applications/sysutils/mkdosfs/mkdosfs.plg
similarity index 100%
rename from rosapps/sysutils/mkdosfs/mkdosfs.plg
rename to rosapps/applications/sysutils/mkdosfs/mkdosfs.plg
diff --git a/rosapps/sysutils/pedump/pedump.c b/rosapps/applications/sysutils/pedump/pedump.c
similarity index 100%
rename from rosapps/sysutils/pedump/pedump.c
rename to rosapps/applications/sysutils/pedump/pedump.c
diff --git a/rosapps/sysutils/pedump/pedump.rbuild b/rosapps/applications/sysutils/pedump/pedump.rbuild
similarity index 100%
rename from rosapps/sysutils/pedump/pedump.rbuild
rename to rosapps/applications/sysutils/pedump/pedump.rbuild
diff --git a/rosapps/sysutils/pedump/pedump.rc b/rosapps/applications/sysutils/pedump/pedump.rc
similarity index 100%
rename from rosapps/sysutils/pedump/pedump.rc
rename to rosapps/applications/sysutils/pedump/pedump.rc
diff --git a/rosapps/sysutils/qssi/qssi.c b/rosapps/applications/sysutils/qssi/qssi.c
similarity index 100%
rename from rosapps/sysutils/qssi/qssi.c
rename to rosapps/applications/sysutils/qssi/qssi.c
diff --git a/rosapps/sysutils/qssi/qssi.rc b/rosapps/applications/sysutils/qssi/qssi.rc
similarity index 100%
rename from rosapps/sysutils/qssi/qssi.rc
rename to rosapps/applications/sysutils/qssi/qssi.rc
diff --git a/rosapps/sysutils/regexpl/ArgumentParser.cpp b/rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ArgumentParser.cpp
rename to rosapps/applications/sysutils/regexpl/ArgumentParser.cpp
diff --git a/rosapps/sysutils/regexpl/ArgumentParser.h b/rosapps/applications/sysutils/regexpl/ArgumentParser.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ArgumentParser.h
rename to rosapps/applications/sysutils/regexpl/ArgumentParser.h
diff --git a/rosapps/sysutils/regexpl/Completion.cpp b/rosapps/applications/sysutils/regexpl/Completion.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/Completion.cpp
rename to rosapps/applications/sysutils/regexpl/Completion.cpp
diff --git a/rosapps/sysutils/regexpl/Completion.h b/rosapps/applications/sysutils/regexpl/Completion.h
similarity index 100%
rename from rosapps/sysutils/regexpl/Completion.h
rename to rosapps/applications/sysutils/regexpl/Completion.h
diff --git a/rosapps/sysutils/regexpl/Console.cpp b/rosapps/applications/sysutils/regexpl/Console.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/Console.cpp
rename to rosapps/applications/sysutils/regexpl/Console.cpp
diff --git a/rosapps/sysutils/regexpl/Console.h b/rosapps/applications/sysutils/regexpl/Console.h
similarity index 100%
rename from rosapps/sysutils/regexpl/Console.h
rename to rosapps/applications/sysutils/regexpl/Console.h
diff --git a/rosapps/sysutils/regexpl/CrtSupplement.c b/rosapps/applications/sysutils/regexpl/CrtSupplement.c
similarity index 100%
rename from rosapps/sysutils/regexpl/CrtSupplement.c
rename to rosapps/applications/sysutils/regexpl/CrtSupplement.c
diff --git a/rosapps/sysutils/regexpl/Pattern.cpp b/rosapps/applications/sysutils/regexpl/Pattern.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/Pattern.cpp
rename to rosapps/applications/sysutils/regexpl/Pattern.cpp
diff --git a/rosapps/sysutils/regexpl/Pattern.h b/rosapps/applications/sysutils/regexpl/Pattern.h
similarity index 100%
rename from rosapps/sysutils/regexpl/Pattern.h
rename to rosapps/applications/sysutils/regexpl/Pattern.h
diff --git a/rosapps/sysutils/regexpl/Prompt.cpp b/rosapps/applications/sysutils/regexpl/Prompt.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/Prompt.cpp
rename to rosapps/applications/sysutils/regexpl/Prompt.cpp
diff --git a/rosapps/sysutils/regexpl/Prompt.h b/rosapps/applications/sysutils/regexpl/Prompt.h
similarity index 100%
rename from rosapps/sysutils/regexpl/Prompt.h
rename to rosapps/applications/sysutils/regexpl/Prompt.h
diff --git a/rosapps/sysutils/regexpl/README b/rosapps/applications/sysutils/regexpl/README
similarity index 92%
rename from rosapps/sysutils/regexpl/README
rename to rosapps/applications/sysutils/regexpl/README
index 9c14f67147c..da3828339af 100644
--- a/rosapps/sysutils/regexpl/README
+++ b/rosapps/applications/sysutils/regexpl/README
@@ -1,5 +1,5 @@
 -*- Mode: Text -*-
-$Id: README,v 1.1 2003/02/09 02:13:27 narnaoud Exp $
+$Id$
 
 Registry Explorer is console mode tool for reading/writing ReactOS
 registry. Currently, access is provided only by means of interactive
diff --git a/rosapps/sysutils/regexpl/RegistryExplorer.cpp b/rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/RegistryExplorer.cpp
rename to rosapps/applications/sysutils/regexpl/RegistryExplorer.cpp
diff --git a/rosapps/sysutils/regexpl/RegistryExplorer.h b/rosapps/applications/sysutils/regexpl/RegistryExplorer.h
similarity index 100%
rename from rosapps/sysutils/regexpl/RegistryExplorer.h
rename to rosapps/applications/sysutils/regexpl/RegistryExplorer.h
diff --git a/rosapps/sysutils/regexpl/RegistryKey.cpp b/rosapps/applications/sysutils/regexpl/RegistryKey.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/RegistryKey.cpp
rename to rosapps/applications/sysutils/regexpl/RegistryKey.cpp
diff --git a/rosapps/sysutils/regexpl/RegistryKey.h b/rosapps/applications/sysutils/regexpl/RegistryKey.h
similarity index 100%
rename from rosapps/sysutils/regexpl/RegistryKey.h
rename to rosapps/applications/sysutils/regexpl/RegistryKey.h
diff --git a/rosapps/sysutils/regexpl/RegistryTree.cpp b/rosapps/applications/sysutils/regexpl/RegistryTree.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/RegistryTree.cpp
rename to rosapps/applications/sysutils/regexpl/RegistryTree.cpp
diff --git a/rosapps/sysutils/regexpl/RegistryTree.h b/rosapps/applications/sysutils/regexpl/RegistryTree.h
similarity index 100%
rename from rosapps/sysutils/regexpl/RegistryTree.h
rename to rosapps/applications/sysutils/regexpl/RegistryTree.h
diff --git a/rosapps/sysutils/regexpl/SecurityDescriptor.cpp b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/SecurityDescriptor.cpp
rename to rosapps/applications/sysutils/regexpl/SecurityDescriptor.cpp
diff --git a/rosapps/sysutils/regexpl/SecurityDescriptor.h b/rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
similarity index 100%
rename from rosapps/sysutils/regexpl/SecurityDescriptor.h
rename to rosapps/applications/sysutils/regexpl/SecurityDescriptor.h
diff --git a/rosapps/sysutils/regexpl/Settings.cpp b/rosapps/applications/sysutils/regexpl/Settings.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/Settings.cpp
rename to rosapps/applications/sysutils/regexpl/Settings.cpp
diff --git a/rosapps/sysutils/regexpl/Settings.h b/rosapps/applications/sysutils/regexpl/Settings.h
similarity index 100%
rename from rosapps/sysutils/regexpl/Settings.h
rename to rosapps/applications/sysutils/regexpl/Settings.h
diff --git a/rosapps/sysutils/regexpl/ShellCommand.cpp b/rosapps/applications/sysutils/regexpl/ShellCommand.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommand.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommand.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommand.h b/rosapps/applications/sysutils/regexpl/ShellCommand.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommand.h
rename to rosapps/applications/sysutils/regexpl/ShellCommand.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandChangeKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandChangeKey.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandChangeKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandChangeKey.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandChangeKey.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandConnect.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandConnect.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandConnect.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandConnect.h b/rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandConnect.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandConnect.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandDACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDACL.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandDACL.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandDACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDACL.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandDACL.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandDOKA.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDOKA.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandDOKA.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandDOKA.h b/rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDOKA.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandDOKA.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandDeleteKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDeleteKey.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandDeleteKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDeleteKey.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandDeleteKey.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandDeleteValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDeleteValue.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandDeleteValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDeleteValue.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandDeleteValue.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandDir.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDir.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandDir.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandDir.h b/rosapps/applications/sysutils/regexpl/ShellCommandDir.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandDir.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandDir.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandExit.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandExit.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandExit.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandExit.h b/rosapps/applications/sysutils/regexpl/ShellCommandExit.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandExit.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandExit.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandHelp.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandHelp.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandHelp.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandHelp.h b/rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandHelp.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandHelp.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandNewKey.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandNewKey.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandNewKey.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandNewKey.h b/rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandNewKey.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandNewKey.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandOwner.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandOwner.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandOwner.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandOwner.h b/rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandOwner.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandOwner.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandSACL.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandSACL.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandSACL.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandSACL.h b/rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandSACL.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandSACL.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandSetValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandSetValue.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandSetValue.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandSetValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandSetValue.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandSetValue.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandValue.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandValue.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandValue.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandValue.h b/rosapps/applications/sysutils/regexpl/ShellCommandValue.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandValue.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandValue.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandVersion.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandVersion.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandVersion.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandVersion.h b/rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandVersion.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandVersion.h
diff --git a/rosapps/sysutils/regexpl/ShellCommandsLinkedList.cpp b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandsLinkedList.cpp
rename to rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.cpp
diff --git a/rosapps/sysutils/regexpl/ShellCommandsLinkedList.h b/rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ShellCommandsLinkedList.h
rename to rosapps/applications/sysutils/regexpl/ShellCommandsLinkedList.h
diff --git a/rosapps/sysutils/regexpl/TextHistory.cpp b/rosapps/applications/sysutils/regexpl/TextHistory.cpp
similarity index 100%
rename from rosapps/sysutils/regexpl/TextHistory.cpp
rename to rosapps/applications/sysutils/regexpl/TextHistory.cpp
diff --git a/rosapps/sysutils/regexpl/TextHistory.h b/rosapps/applications/sysutils/regexpl/TextHistory.h
similarity index 100%
rename from rosapps/sysutils/regexpl/TextHistory.h
rename to rosapps/applications/sysutils/regexpl/TextHistory.h
diff --git a/rosapps/sysutils/regexpl/ph.h b/rosapps/applications/sysutils/regexpl/ph.h
similarity index 100%
rename from rosapps/sysutils/regexpl/ph.h
rename to rosapps/applications/sysutils/regexpl/ph.h
diff --git a/rosapps/sysutils/regexpl/regexpl.rbuild b/rosapps/applications/sysutils/regexpl/regexpl.rbuild
similarity index 100%
rename from rosapps/sysutils/regexpl/regexpl.rbuild
rename to rosapps/applications/sysutils/regexpl/regexpl.rbuild
diff --git a/rosapps/sysutils/regexpl/regexpl.rc b/rosapps/applications/sysutils/regexpl/regexpl.rc
similarity index 100%
rename from rosapps/sysutils/regexpl/regexpl.rc
rename to rosapps/applications/sysutils/regexpl/regexpl.rc
diff --git a/rosapps/sysutils/systeminfo/lang/de-DE.rc b/rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/lang/de-DE.rc
rename to rosapps/applications/sysutils/systeminfo/lang/de-DE.rc
diff --git a/rosapps/sysutils/systeminfo/lang/en-US.rc b/rosapps/applications/sysutils/systeminfo/lang/en-US.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/lang/en-US.rc
rename to rosapps/applications/sysutils/systeminfo/lang/en-US.rc
diff --git a/rosapps/sysutils/systeminfo/lang/es-ES.rc b/rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/lang/es-ES.rc
rename to rosapps/applications/sysutils/systeminfo/lang/es-ES.rc
diff --git a/rosapps/sysutils/systeminfo/lang/fr-FR.rc b/rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/lang/fr-FR.rc
rename to rosapps/applications/sysutils/systeminfo/lang/fr-FR.rc
diff --git a/rosapps/sysutils/systeminfo/lang/pl-PL.rc b/rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/lang/pl-PL.rc
rename to rosapps/applications/sysutils/systeminfo/lang/pl-PL.rc
diff --git a/rosapps/sysutils/systeminfo/lang/uk-UA.rc b/rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/lang/uk-UA.rc
rename to rosapps/applications/sysutils/systeminfo/lang/uk-UA.rc
diff --git a/rosapps/sysutils/systeminfo/resource.h b/rosapps/applications/sysutils/systeminfo/resource.h
similarity index 100%
rename from rosapps/sysutils/systeminfo/resource.h
rename to rosapps/applications/sysutils/systeminfo/resource.h
diff --git a/rosapps/sysutils/systeminfo/rsrc.rc b/rosapps/applications/sysutils/systeminfo/rsrc.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/rsrc.rc
rename to rosapps/applications/sysutils/systeminfo/rsrc.rc
diff --git a/rosapps/sysutils/systeminfo/systeminfo.c b/rosapps/applications/sysutils/systeminfo/systeminfo.c
similarity index 100%
rename from rosapps/sysutils/systeminfo/systeminfo.c
rename to rosapps/applications/sysutils/systeminfo/systeminfo.c
diff --git a/rosapps/sysutils/systeminfo/systeminfo.rbuild b/rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
similarity index 100%
rename from rosapps/sysutils/systeminfo/systeminfo.rbuild
rename to rosapps/applications/sysutils/systeminfo/systeminfo.rbuild
diff --git a/rosapps/sysutils/systeminfo/systeminfo.rc b/rosapps/applications/sysutils/systeminfo/systeminfo.rc
similarity index 100%
rename from rosapps/sysutils/systeminfo/systeminfo.rc
rename to rosapps/applications/sysutils/systeminfo/systeminfo.rc
diff --git a/rosapps/sysutils/sysutils.rbuild b/rosapps/applications/sysutils/sysutils.rbuild
similarity index 100%
rename from rosapps/sysutils/sysutils.rbuild
rename to rosapps/applications/sysutils/sysutils.rbuild
diff --git a/rosapps/sysutils/tcat/cat.c b/rosapps/applications/sysutils/tcat/cat.c
similarity index 100%
rename from rosapps/sysutils/tcat/cat.c
rename to rosapps/applications/sysutils/tcat/cat.c
diff --git a/rosapps/sysutils/tcat/tcat.rbuild b/rosapps/applications/sysutils/tcat/tcat.rbuild
similarity index 100%
rename from rosapps/sysutils/tcat/tcat.rbuild
rename to rosapps/applications/sysutils/tcat/tcat.rbuild
diff --git a/rosapps/sysutils/tlist/tlist.c b/rosapps/applications/sysutils/tlist/tlist.c
similarity index 100%
rename from rosapps/sysutils/tlist/tlist.c
rename to rosapps/applications/sysutils/tlist/tlist.c
diff --git a/rosapps/sysutils/tlist/tlist.rbuild b/rosapps/applications/sysutils/tlist/tlist.rbuild
similarity index 100%
rename from rosapps/sysutils/tlist/tlist.rbuild
rename to rosapps/applications/sysutils/tlist/tlist.rbuild
diff --git a/rosapps/sysutils/tlist/tlist.rc b/rosapps/applications/sysutils/tlist/tlist.rc
similarity index 100%
rename from rosapps/sysutils/tlist/tlist.rc
rename to rosapps/applications/sysutils/tlist/tlist.rc
diff --git a/rosapps/sysutils/utils/binpatch/binpatch.rbuild b/rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/binpatch/binpatch.rbuild
rename to rosapps/applications/sysutils/utils/binpatch/binpatch.rbuild
diff --git a/rosapps/sysutils/utils/binpatch/patch.c b/rosapps/applications/sysutils/utils/binpatch/patch.c
similarity index 100%
rename from rosapps/sysutils/utils/binpatch/patch.c
rename to rosapps/applications/sysutils/utils/binpatch/patch.c
diff --git a/rosapps/sysutils/utils/cat/cat.c b/rosapps/applications/sysutils/utils/cat/cat.c
similarity index 100%
rename from rosapps/sysutils/utils/cat/cat.c
rename to rosapps/applications/sysutils/utils/cat/cat.c
diff --git a/rosapps/sysutils/utils/cat/cat.rbuild b/rosapps/applications/sysutils/utils/cat/cat.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/cat/cat.rbuild
rename to rosapps/applications/sysutils/utils/cat/cat.rbuild
diff --git a/rosapps/sysutils/utils/driver/driver.rbuild b/rosapps/applications/sysutils/utils/driver/driver.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/driver/driver.rbuild
rename to rosapps/applications/sysutils/utils/driver/driver.rbuild
diff --git a/rosapps/sysutils/utils/driver/load/load.c b/rosapps/applications/sysutils/utils/driver/load/load.c
similarity index 100%
rename from rosapps/sysutils/utils/driver/load/load.c
rename to rosapps/applications/sysutils/utils/driver/load/load.c
diff --git a/rosapps/sysutils/utils/driver/load/load.rbuild b/rosapps/applications/sysutils/utils/driver/load/load.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/driver/load/load.rbuild
rename to rosapps/applications/sysutils/utils/driver/load/load.rbuild
diff --git a/rosapps/sysutils/utils/driver/unload/unload.c b/rosapps/applications/sysutils/utils/driver/unload/unload.c
similarity index 100%
rename from rosapps/sysutils/utils/driver/unload/unload.c
rename to rosapps/applications/sysutils/utils/driver/unload/unload.c
diff --git a/rosapps/sysutils/utils/driver/unload/unload.rbuild b/rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/driver/unload/unload.rbuild
rename to rosapps/applications/sysutils/utils/driver/unload/unload.rbuild
diff --git a/rosapps/sysutils/utils/infinst/infinst.c b/rosapps/applications/sysutils/utils/infinst/infinst.c
similarity index 100%
rename from rosapps/sysutils/utils/infinst/infinst.c
rename to rosapps/applications/sysutils/utils/infinst/infinst.c
diff --git a/rosapps/sysutils/utils/infinst/infinst.rbuild b/rosapps/applications/sysutils/utils/infinst/infinst.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/infinst/infinst.rbuild
rename to rosapps/applications/sysutils/utils/infinst/infinst.rbuild
diff --git a/rosapps/sysutils/utils/nts2w32err/nts2w32err.c b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
similarity index 100%
rename from rosapps/sysutils/utils/nts2w32err/nts2w32err.c
rename to rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.c
diff --git a/rosapps/sysutils/utils/nts2w32err/nts2w32err.rbuild b/rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/nts2w32err/nts2w32err.rbuild
rename to rosapps/applications/sysutils/utils/nts2w32err/nts2w32err.rbuild
diff --git a/rosapps/sysutils/utils/objdir/objdir.c b/rosapps/applications/sysutils/utils/objdir/objdir.c
similarity index 100%
rename from rosapps/sysutils/utils/objdir/objdir.c
rename to rosapps/applications/sysutils/utils/objdir/objdir.c
diff --git a/rosapps/sysutils/utils/objdir/objdir.rbuild b/rosapps/applications/sysutils/utils/objdir/objdir.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/objdir/objdir.rbuild
rename to rosapps/applications/sysutils/utils/objdir/objdir.rbuild
diff --git a/rosapps/sysutils/utils/partinfo/partinfo.c b/rosapps/applications/sysutils/utils/partinfo/partinfo.c
similarity index 100%
rename from rosapps/sysutils/utils/partinfo/partinfo.c
rename to rosapps/applications/sysutils/utils/partinfo/partinfo.c
diff --git a/rosapps/sysutils/utils/partinfo/partinfo.rbuild b/rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/partinfo/partinfo.rbuild
rename to rosapps/applications/sysutils/utils/partinfo/partinfo.rbuild
diff --git a/rosapps/sysutils/utils/pice/loader/main.c b/rosapps/applications/sysutils/utils/pice/loader/main.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/main.c
rename to rosapps/applications/sysutils/utils/pice/loader/main.c
diff --git a/rosapps/sysutils/utils/pice/loader/retypes.h b/rosapps/applications/sysutils/utils/pice/loader/retypes.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/retypes.h
rename to rosapps/applications/sysutils/utils/pice/loader/retypes.h
diff --git a/rosapps/sysutils/utils/pice/loader/stab.def b/rosapps/applications/sysutils/utils/pice/loader/stab.def
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/stab.def
rename to rosapps/applications/sysutils/utils/pice/loader/stab.def
diff --git a/rosapps/sysutils/utils/pice/loader/stab_gnu.h b/rosapps/applications/sysutils/utils/pice/loader/stab_gnu.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/stab_gnu.h
rename to rosapps/applications/sysutils/utils/pice/loader/stab_gnu.h
diff --git a/rosapps/sysutils/utils/pice/loader/stdinc.h b/rosapps/applications/sysutils/utils/pice/loader/stdinc.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/stdinc.h
rename to rosapps/applications/sysutils/utils/pice/loader/stdinc.h
diff --git a/rosapps/sysutils/utils/pice/loader/terminal.c b/rosapps/applications/sysutils/utils/pice/loader/terminal.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/terminal.c
rename to rosapps/applications/sysutils/utils/pice/loader/terminal.c
diff --git a/rosapps/sysutils/utils/pice/loader/terminal.h b/rosapps/applications/sysutils/utils/pice/loader/terminal.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/loader/terminal.h
rename to rosapps/applications/sysutils/utils/pice/loader/terminal.h
diff --git a/rosapps/sysutils/utils/pice/module/animation.h b/rosapps/applications/sysutils/utils/pice/module/animation.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/animation.h
rename to rosapps/applications/sysutils/utils/pice/module/animation.h
diff --git a/rosapps/sysutils/utils/pice/module/bp.c b/rosapps/applications/sysutils/utils/pice/module/bp.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/bp.c
rename to rosapps/applications/sysutils/utils/pice/module/bp.c
diff --git a/rosapps/sysutils/utils/pice/module/bp.h b/rosapps/applications/sysutils/utils/pice/module/bp.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/bp.h
rename to rosapps/applications/sysutils/utils/pice/module/bp.h
diff --git a/rosapps/sysutils/utils/pice/module/charset.h b/rosapps/applications/sysutils/utils/pice/module/charset.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/charset.h
rename to rosapps/applications/sysutils/utils/pice/module/charset.h
diff --git a/rosapps/sysutils/utils/pice/module/dblflt.c b/rosapps/applications/sysutils/utils/pice/module/dblflt.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/dblflt.c
rename to rosapps/applications/sysutils/utils/pice/module/dblflt.c
diff --git a/rosapps/sysutils/utils/pice/module/dblflt.h b/rosapps/applications/sysutils/utils/pice/module/dblflt.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/dblflt.h
rename to rosapps/applications/sysutils/utils/pice/module/dblflt.h
diff --git a/rosapps/sysutils/utils/pice/module/debug.c b/rosapps/applications/sysutils/utils/pice/module/debug.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/debug.c
rename to rosapps/applications/sysutils/utils/pice/module/debug.c
diff --git a/rosapps/sysutils/utils/pice/module/debug.h b/rosapps/applications/sysutils/utils/pice/module/debug.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/debug.h
rename to rosapps/applications/sysutils/utils/pice/module/debug.h
diff --git a/rosapps/sysutils/utils/pice/module/disassembler.c b/rosapps/applications/sysutils/utils/pice/module/disassembler.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/disassembler.c
rename to rosapps/applications/sysutils/utils/pice/module/disassembler.c
diff --git a/rosapps/sysutils/utils/pice/module/disassembler.h b/rosapps/applications/sysutils/utils/pice/module/disassembler.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/disassembler.h
rename to rosapps/applications/sysutils/utils/pice/module/disassembler.h
diff --git a/rosapps/sysutils/utils/pice/module/disassemblerdata.h b/rosapps/applications/sysutils/utils/pice/module/disassemblerdata.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/disassemblerdata.h
rename to rosapps/applications/sysutils/utils/pice/module/disassemblerdata.h
diff --git a/rosapps/sysutils/utils/pice/module/disassemblerdefines.h b/rosapps/applications/sysutils/utils/pice/module/disassemblerdefines.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/disassemblerdefines.h
rename to rosapps/applications/sysutils/utils/pice/module/disassemblerdefines.h
diff --git a/rosapps/sysutils/utils/pice/module/gpfault.c b/rosapps/applications/sysutils/utils/pice/module/gpfault.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/gpfault.c
rename to rosapps/applications/sysutils/utils/pice/module/gpfault.c
diff --git a/rosapps/sysutils/utils/pice/module/gpfault.h b/rosapps/applications/sysutils/utils/pice/module/gpfault.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/gpfault.h
rename to rosapps/applications/sysutils/utils/pice/module/gpfault.h
diff --git a/rosapps/sysutils/utils/pice/module/hardware.c b/rosapps/applications/sysutils/utils/pice/module/hardware.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/hardware.c
rename to rosapps/applications/sysutils/utils/pice/module/hardware.c
diff --git a/rosapps/sysutils/utils/pice/module/hardware.h b/rosapps/applications/sysutils/utils/pice/module/hardware.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/hardware.h
rename to rosapps/applications/sysutils/utils/pice/module/hardware.h
diff --git a/rosapps/sysutils/utils/pice/module/hercules.c b/rosapps/applications/sysutils/utils/pice/module/hercules.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/hercules.c
rename to rosapps/applications/sysutils/utils/pice/module/hercules.c
diff --git a/rosapps/sysutils/utils/pice/module/hercules.h b/rosapps/applications/sysutils/utils/pice/module/hercules.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/hercules.h
rename to rosapps/applications/sysutils/utils/pice/module/hercules.h
diff --git a/rosapps/sysutils/utils/pice/module/hooks.c b/rosapps/applications/sysutils/utils/pice/module/hooks.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/hooks.c
rename to rosapps/applications/sysutils/utils/pice/module/hooks.c
diff --git a/rosapps/sysutils/utils/pice/module/hooks.h b/rosapps/applications/sysutils/utils/pice/module/hooks.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/hooks.h
rename to rosapps/applications/sysutils/utils/pice/module/hooks.h
diff --git a/rosapps/sysutils/utils/pice/module/init.c b/rosapps/applications/sysutils/utils/pice/module/init.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/init.c
rename to rosapps/applications/sysutils/utils/pice/module/init.c
diff --git a/rosapps/sysutils/utils/pice/module/init.h b/rosapps/applications/sysutils/utils/pice/module/init.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/init.h
rename to rosapps/applications/sysutils/utils/pice/module/init.h
diff --git a/rosapps/sysutils/utils/pice/module/ldrsym.h b/rosapps/applications/sysutils/utils/pice/module/ldrsym.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/ldrsym.h
rename to rosapps/applications/sysutils/utils/pice/module/ldrsym.h
diff --git a/rosapps/sysutils/utils/pice/module/logo.h b/rosapps/applications/sysutils/utils/pice/module/logo.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/logo.h
rename to rosapps/applications/sysutils/utils/pice/module/logo.h
diff --git a/rosapps/sysutils/utils/pice/module/output.c b/rosapps/applications/sysutils/utils/pice/module/output.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/output.c
rename to rosapps/applications/sysutils/utils/pice/module/output.c
diff --git a/rosapps/sysutils/utils/pice/module/output.h b/rosapps/applications/sysutils/utils/pice/module/output.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/output.h
rename to rosapps/applications/sysutils/utils/pice/module/output.h
diff --git a/rosapps/sysutils/utils/pice/module/parse.c b/rosapps/applications/sysutils/utils/pice/module/parse.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/parse.c
rename to rosapps/applications/sysutils/utils/pice/module/parse.c
diff --git a/rosapps/sysutils/utils/pice/module/parse.h b/rosapps/applications/sysutils/utils/pice/module/parse.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/parse.h
rename to rosapps/applications/sysutils/utils/pice/module/parse.h
diff --git a/rosapps/sysutils/utils/pice/module/patch.c b/rosapps/applications/sysutils/utils/pice/module/patch.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/patch.c
rename to rosapps/applications/sysutils/utils/pice/module/patch.c
diff --git a/rosapps/sysutils/utils/pice/module/patch.h b/rosapps/applications/sysutils/utils/pice/module/patch.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/patch.h
rename to rosapps/applications/sysutils/utils/pice/module/patch.h
diff --git a/rosapps/sysutils/utils/pice/module/pci_ids.h b/rosapps/applications/sysutils/utils/pice/module/pci_ids.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/pci_ids.h
rename to rosapps/applications/sysutils/utils/pice/module/pci_ids.h
diff --git a/rosapps/sysutils/utils/pice/module/pgflt.c b/rosapps/applications/sysutils/utils/pice/module/pgflt.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/pgflt.c
rename to rosapps/applications/sysutils/utils/pice/module/pgflt.c
diff --git a/rosapps/sysutils/utils/pice/module/pgflt.h b/rosapps/applications/sysutils/utils/pice/module/pgflt.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/pgflt.h
rename to rosapps/applications/sysutils/utils/pice/module/pgflt.h
diff --git a/rosapps/sysutils/utils/pice/module/pice.rc b/rosapps/applications/sysutils/utils/pice/module/pice.rc
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/pice.rc
rename to rosapps/applications/sysutils/utils/pice/module/pice.rc
diff --git a/rosapps/sysutils/utils/pice/module/pice_ver.h b/rosapps/applications/sysutils/utils/pice/module/pice_ver.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/pice_ver.h
rename to rosapps/applications/sysutils/utils/pice/module/pice_ver.h
diff --git a/rosapps/sysutils/utils/pice/module/precomp.h b/rosapps/applications/sysutils/utils/pice/module/precomp.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/precomp.h
rename to rosapps/applications/sysutils/utils/pice/module/precomp.h
diff --git a/rosapps/sysutils/utils/pice/module/privateice.c b/rosapps/applications/sysutils/utils/pice/module/privateice.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/privateice.c
rename to rosapps/applications/sysutils/utils/pice/module/privateice.c
diff --git a/rosapps/sysutils/utils/pice/module/regs.h b/rosapps/applications/sysutils/utils/pice/module/regs.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/regs.h
rename to rosapps/applications/sysutils/utils/pice/module/regs.h
diff --git a/rosapps/sysutils/utils/pice/module/remods.h b/rosapps/applications/sysutils/utils/pice/module/remods.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/remods.h
rename to rosapps/applications/sysutils/utils/pice/module/remods.h
diff --git a/rosapps/sysutils/utils/pice/module/retypes.h b/rosapps/applications/sysutils/utils/pice/module/retypes.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/retypes.h
rename to rosapps/applications/sysutils/utils/pice/module/retypes.h
diff --git a/rosapps/sysutils/utils/pice/module/scancodes.h b/rosapps/applications/sysutils/utils/pice/module/scancodes.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/scancodes.h
rename to rosapps/applications/sysutils/utils/pice/module/scancodes.h
diff --git a/rosapps/sysutils/utils/pice/module/serial.c b/rosapps/applications/sysutils/utils/pice/module/serial.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/serial.c
rename to rosapps/applications/sysutils/utils/pice/module/serial.c
diff --git a/rosapps/sysutils/utils/pice/module/serial.h b/rosapps/applications/sysutils/utils/pice/module/serial.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/serial.h
rename to rosapps/applications/sysutils/utils/pice/module/serial.h
diff --git a/rosapps/sysutils/utils/pice/module/serial_port.h b/rosapps/applications/sysutils/utils/pice/module/serial_port.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/serial_port.h
rename to rosapps/applications/sysutils/utils/pice/module/serial_port.h
diff --git a/rosapps/sysutils/utils/pice/module/shell.c b/rosapps/applications/sysutils/utils/pice/module/shell.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/shell.c
rename to rosapps/applications/sysutils/utils/pice/module/shell.c
diff --git a/rosapps/sysutils/utils/pice/module/shell.h b/rosapps/applications/sysutils/utils/pice/module/shell.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/shell.h
rename to rosapps/applications/sysutils/utils/pice/module/shell.h
diff --git a/rosapps/sysutils/utils/pice/module/stab.def b/rosapps/applications/sysutils/utils/pice/module/stab.def
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/stab.def
rename to rosapps/applications/sysutils/utils/pice/module/stab.def
diff --git a/rosapps/sysutils/utils/pice/module/stab_gnu.h b/rosapps/applications/sysutils/utils/pice/module/stab_gnu.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/stab_gnu.h
rename to rosapps/applications/sysutils/utils/pice/module/stab_gnu.h
diff --git a/rosapps/sysutils/utils/pice/module/symbols.c b/rosapps/applications/sysutils/utils/pice/module/symbols.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/symbols.c
rename to rosapps/applications/sysutils/utils/pice/module/symbols.c
diff --git a/rosapps/sysutils/utils/pice/module/symbols.h b/rosapps/applications/sysutils/utils/pice/module/symbols.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/symbols.h
rename to rosapps/applications/sysutils/utils/pice/module/symbols.h
diff --git a/rosapps/sysutils/utils/pice/module/syscall.c b/rosapps/applications/sysutils/utils/pice/module/syscall.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/syscall.c
rename to rosapps/applications/sysutils/utils/pice/module/syscall.c
diff --git a/rosapps/sysutils/utils/pice/module/syscall.h b/rosapps/applications/sysutils/utils/pice/module/syscall.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/syscall.h
rename to rosapps/applications/sysutils/utils/pice/module/syscall.h
diff --git a/rosapps/sysutils/utils/pice/module/trace.c b/rosapps/applications/sysutils/utils/pice/module/trace.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/trace.c
rename to rosapps/applications/sysutils/utils/pice/module/trace.c
diff --git a/rosapps/sysutils/utils/pice/module/trace.h b/rosapps/applications/sysutils/utils/pice/module/trace.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/trace.h
rename to rosapps/applications/sysutils/utils/pice/module/trace.h
diff --git a/rosapps/sysutils/utils/pice/module/utils.c b/rosapps/applications/sysutils/utils/pice/module/utils.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/utils.c
rename to rosapps/applications/sysutils/utils/pice/module/utils.c
diff --git a/rosapps/sysutils/utils/pice/module/utils.h b/rosapps/applications/sysutils/utils/pice/module/utils.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/utils.h
rename to rosapps/applications/sysutils/utils/pice/module/utils.h
diff --git a/rosapps/sysutils/utils/pice/module/vga.c b/rosapps/applications/sysutils/utils/pice/module/vga.c
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/vga.c
rename to rosapps/applications/sysutils/utils/pice/module/vga.c
diff --git a/rosapps/sysutils/utils/pice/module/vga.h b/rosapps/applications/sysutils/utils/pice/module/vga.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/vga.h
rename to rosapps/applications/sysutils/utils/pice/module/vga.h
diff --git a/rosapps/sysutils/utils/pice/module/vga_utils.asm b/rosapps/applications/sysutils/utils/pice/module/vga_utils.asm
similarity index 100%
rename from rosapps/sysutils/utils/pice/module/vga_utils.asm
rename to rosapps/applications/sysutils/utils/pice/module/vga_utils.asm
diff --git a/rosapps/sysutils/utils/pice/pice.cfg b/rosapps/applications/sysutils/utils/pice/pice.cfg
similarity index 100%
rename from rosapps/sysutils/utils/pice/pice.cfg
rename to rosapps/applications/sysutils/utils/pice/pice.cfg
diff --git a/rosapps/sysutils/utils/pice/readme.txt b/rosapps/applications/sysutils/utils/pice/readme.txt
similarity index 100%
rename from rosapps/sysutils/utils/pice/readme.txt
rename to rosapps/applications/sysutils/utils/pice/readme.txt
diff --git a/rosapps/sysutils/utils/pice/shared/shared.h b/rosapps/applications/sysutils/utils/pice/shared/shared.h
similarity index 100%
rename from rosapps/sysutils/utils/pice/shared/shared.h
rename to rosapps/applications/sysutils/utils/pice/shared/shared.h
diff --git a/rosapps/sysutils/utils/pnpdump/pnpdump.c b/rosapps/applications/sysutils/utils/pnpdump/pnpdump.c
similarity index 100%
rename from rosapps/sysutils/utils/pnpdump/pnpdump.c
rename to rosapps/applications/sysutils/utils/pnpdump/pnpdump.c
diff --git a/rosapps/sysutils/utils/ps/ps.c b/rosapps/applications/sysutils/utils/ps/ps.c
similarity index 100%
rename from rosapps/sysutils/utils/ps/ps.c
rename to rosapps/applications/sysutils/utils/ps/ps.c
diff --git a/rosapps/sysutils/utils/ps/ps.c.toolhelp b/rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
similarity index 100%
rename from rosapps/sysutils/utils/ps/ps.c.toolhelp
rename to rosapps/applications/sysutils/utils/ps/ps.c.toolhelp
diff --git a/rosapps/sysutils/utils/ps/ps.rbuild b/rosapps/applications/sysutils/utils/ps/ps.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/ps/ps.rbuild
rename to rosapps/applications/sysutils/utils/ps/ps.rbuild
diff --git a/rosapps/sysutils/utils/rosperf/alphablend.c b/rosapps/applications/sysutils/utils/rosperf/alphablend.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/alphablend.c
rename to rosapps/applications/sysutils/utils/rosperf/alphablend.c
diff --git a/rosapps/sysutils/utils/rosperf/fill.c b/rosapps/applications/sysutils/utils/rosperf/fill.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/fill.c
rename to rosapps/applications/sysutils/utils/rosperf/fill.c
diff --git a/rosapps/sysutils/utils/rosperf/gradient.c b/rosapps/applications/sysutils/utils/rosperf/gradient.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/gradient.c
rename to rosapps/applications/sysutils/utils/rosperf/gradient.c
diff --git a/rosapps/sysutils/utils/rosperf/lines.c b/rosapps/applications/sysutils/utils/rosperf/lines.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/lines.c
rename to rosapps/applications/sysutils/utils/rosperf/lines.c
diff --git a/rosapps/sysutils/utils/rosperf/rosperf.c b/rosapps/applications/sysutils/utils/rosperf/rosperf.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/rosperf.c
rename to rosapps/applications/sysutils/utils/rosperf/rosperf.c
diff --git a/rosapps/sysutils/utils/rosperf/rosperf.h b/rosapps/applications/sysutils/utils/rosperf/rosperf.h
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/rosperf.h
rename to rosapps/applications/sysutils/utils/rosperf/rosperf.h
diff --git a/rosapps/sysutils/utils/rosperf/rosperf.rbuild b/rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/rosperf.rbuild
rename to rosapps/applications/sysutils/utils/rosperf/rosperf.rbuild
diff --git a/rosapps/sysutils/utils/rosperf/rosperf.rc b/rosapps/applications/sysutils/utils/rosperf/rosperf.rc
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/rosperf.rc
rename to rosapps/applications/sysutils/utils/rosperf/rosperf.rc
diff --git a/rosapps/sysutils/utils/rosperf/testlist.c b/rosapps/applications/sysutils/utils/rosperf/testlist.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/testlist.c
rename to rosapps/applications/sysutils/utils/rosperf/testlist.c
diff --git a/rosapps/sysutils/utils/rosperf/text.c b/rosapps/applications/sysutils/utils/rosperf/text.c
similarity index 100%
rename from rosapps/sysutils/utils/rosperf/text.c
rename to rosapps/applications/sysutils/utils/rosperf/text.c
diff --git a/rosapps/sysutils/utils/sdkparse/EnumDirs.h b/rosapps/applications/sysutils/utils/sdkparse/EnumDirs.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/EnumDirs.h
rename to rosapps/applications/sysutils/utils/sdkparse/EnumDirs.h
diff --git a/rosapps/sysutils/utils/sdkparse/EnumDirsImpl.h b/rosapps/applications/sysutils/utils/sdkparse/EnumDirsImpl.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/EnumDirsImpl.h
rename to rosapps/applications/sysutils/utils/sdkparse/EnumDirsImpl.h
diff --git a/rosapps/sysutils/utils/sdkparse/EnumFiles.h b/rosapps/applications/sysutils/utils/sdkparse/EnumFiles.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/EnumFiles.h
rename to rosapps/applications/sysutils/utils/sdkparse/EnumFiles.h
diff --git a/rosapps/sysutils/utils/sdkparse/EnumFilesImpl.h b/rosapps/applications/sysutils/utils/sdkparse/EnumFilesImpl.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/EnumFilesImpl.h
rename to rosapps/applications/sysutils/utils/sdkparse/EnumFilesImpl.h
diff --git a/rosapps/sysutils/utils/sdkparse/File.cpp b/rosapps/applications/sysutils/utils/sdkparse/File.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/File.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/File.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/File.h b/rosapps/applications/sysutils/utils/sdkparse/File.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/File.h
rename to rosapps/applications/sysutils/utils/sdkparse/File.h
diff --git a/rosapps/sysutils/utils/sdkparse/FixLFN.h b/rosapps/applications/sysutils/utils/sdkparse/FixLFN.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/FixLFN.h
rename to rosapps/applications/sysutils/utils/sdkparse/FixLFN.h
diff --git a/rosapps/sysutils/utils/sdkparse/Header.h b/rosapps/applications/sysutils/utils/sdkparse/Header.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/Header.h
rename to rosapps/applications/sysutils/utils/sdkparse/Header.h
diff --git a/rosapps/sysutils/utils/sdkparse/Symbol.h b/rosapps/applications/sysutils/utils/sdkparse/Symbol.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/Symbol.h
rename to rosapps/applications/sysutils/utils/sdkparse/Symbol.h
diff --git a/rosapps/sysutils/utils/sdkparse/Type.h b/rosapps/applications/sysutils/utils/sdkparse/Type.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/Type.h
rename to rosapps/applications/sysutils/utils/sdkparse/Type.h
diff --git a/rosapps/sysutils/utils/sdkparse/assert.h b/rosapps/applications/sysutils/utils/sdkparse/assert.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/assert.h
rename to rosapps/applications/sysutils/utils/sdkparse/assert.h
diff --git a/rosapps/sysutils/utils/sdkparse/binary2cstr.cpp b/rosapps/applications/sysutils/utils/sdkparse/binary2cstr.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/binary2cstr.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/binary2cstr.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/binary2cstr.h b/rosapps/applications/sysutils/utils/sdkparse/binary2cstr.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/binary2cstr.h
rename to rosapps/applications/sysutils/utils/sdkparse/binary2cstr.h
diff --git a/rosapps/sysutils/utils/sdkparse/input.lst b/rosapps/applications/sysutils/utils/sdkparse/input.lst
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/input.lst
rename to rosapps/applications/sysutils/utils/sdkparse/input.lst
diff --git a/rosapps/sysutils/utils/sdkparse/iskeyword.cpp b/rosapps/applications/sysutils/utils/sdkparse/iskeyword.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/iskeyword.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/iskeyword.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/iskeyword.h b/rosapps/applications/sysutils/utils/sdkparse/iskeyword.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/iskeyword.h
rename to rosapps/applications/sysutils/utils/sdkparse/iskeyword.h
diff --git a/rosapps/sysutils/utils/sdkparse/safestr.h b/rosapps/applications/sysutils/utils/sdkparse/safestr.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/safestr.h
rename to rosapps/applications/sysutils/utils/sdkparse/safestr.h
diff --git a/rosapps/sysutils/utils/sdkparse/sdkparse.cpp b/rosapps/applications/sysutils/utils/sdkparse/sdkparse.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/sdkparse.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/sdkparse.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/sdkparse.dsp b/rosapps/applications/sysutils/utils/sdkparse/sdkparse.dsp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/sdkparse.dsp
rename to rosapps/applications/sysutils/utils/sdkparse/sdkparse.dsp
diff --git a/rosapps/sysutils/utils/sdkparse/sdkparse.dsw b/rosapps/applications/sysutils/utils/sdkparse/sdkparse.dsw
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/sdkparse.dsw
rename to rosapps/applications/sysutils/utils/sdkparse/sdkparse.dsw
diff --git a/rosapps/sysutils/utils/sdkparse/skip_ws.cpp b/rosapps/applications/sysutils/utils/sdkparse/skip_ws.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/skip_ws.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/skip_ws.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/skip_ws.h b/rosapps/applications/sysutils/utils/sdkparse/skip_ws.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/skip_ws.h
rename to rosapps/applications/sysutils/utils/sdkparse/skip_ws.h
diff --git a/rosapps/sysutils/utils/sdkparse/strip_comments.cpp b/rosapps/applications/sysutils/utils/sdkparse/strip_comments.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/strip_comments.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/strip_comments.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/strip_comments.h b/rosapps/applications/sysutils/utils/sdkparse/strip_comments.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/strip_comments.h
rename to rosapps/applications/sysutils/utils/sdkparse/strip_comments.h
diff --git a/rosapps/sysutils/utils/sdkparse/test.h b/rosapps/applications/sysutils/utils/sdkparse/test.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/test.h
rename to rosapps/applications/sysutils/utils/sdkparse/test.h
diff --git a/rosapps/sysutils/utils/sdkparse/tokenize.cpp b/rosapps/applications/sysutils/utils/sdkparse/tokenize.cpp
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/tokenize.cpp
rename to rosapps/applications/sysutils/utils/sdkparse/tokenize.cpp
diff --git a/rosapps/sysutils/utils/sdkparse/tokenize.h b/rosapps/applications/sysutils/utils/sdkparse/tokenize.h
similarity index 100%
rename from rosapps/sysutils/utils/sdkparse/tokenize.h
rename to rosapps/applications/sysutils/utils/sdkparse/tokenize.h
diff --git a/rosapps/sysutils/utils/stats/stats.c b/rosapps/applications/sysutils/utils/stats/stats.c
similarity index 100%
rename from rosapps/sysutils/utils/stats/stats.c
rename to rosapps/applications/sysutils/utils/stats/stats.c
diff --git a/rosapps/sysutils/utils/stats/stats.rbuild b/rosapps/applications/sysutils/utils/stats/stats.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/stats/stats.rbuild
rename to rosapps/applications/sysutils/utils/stats/stats.rbuild
diff --git a/rosapps/sysutils/utils/theme/dump/manifest.rbuild b/rosapps/applications/sysutils/utils/theme/dump/manifest.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/theme/dump/manifest.rbuild
rename to rosapps/applications/sysutils/utils/theme/dump/manifest.rbuild
diff --git a/rosapps/sysutils/utils/theme/dump/themedump.bpr b/rosapps/applications/sysutils/utils/theme/dump/themedump.bpr
similarity index 100%
rename from rosapps/sysutils/utils/theme/dump/themedump.bpr
rename to rosapps/applications/sysutils/utils/theme/dump/themedump.bpr
diff --git a/rosapps/sysutils/utils/theme/dump/themedump.cpp b/rosapps/applications/sysutils/utils/theme/dump/themedump.cpp
similarity index 100%
rename from rosapps/sysutils/utils/theme/dump/themedump.cpp
rename to rosapps/applications/sysutils/utils/theme/dump/themedump.cpp
diff --git a/rosapps/sysutils/utils/theme/dump/themedump.rc b/rosapps/applications/sysutils/utils/theme/dump/themedump.rc
similarity index 100%
rename from rosapps/sysutils/utils/theme/dump/themedump.rc
rename to rosapps/applications/sysutils/utils/theme/dump/themedump.rc
diff --git a/rosapps/sysutils/utils/tickcount/tickcount.c b/rosapps/applications/sysutils/utils/tickcount/tickcount.c
similarity index 100%
rename from rosapps/sysutils/utils/tickcount/tickcount.c
rename to rosapps/applications/sysutils/utils/tickcount/tickcount.c
diff --git a/rosapps/sysutils/utils/tickcount/tickcount.rbuild b/rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/tickcount/tickcount.rbuild
rename to rosapps/applications/sysutils/utils/tickcount/tickcount.rbuild
diff --git a/rosapps/sysutils/utils/utils.rbuild b/rosapps/applications/sysutils/utils/utils.rbuild
similarity index 100%
rename from rosapps/sysutils/utils/utils.rbuild
rename to rosapps/applications/sysutils/utils/utils.rbuild
diff --git a/rosapps/sysutils/win32err.h b/rosapps/applications/sysutils/win32err.h
similarity index 100%
rename from rosapps/sysutils/win32err.h
rename to rosapps/applications/sysutils/win32err.h
diff --git a/rosapps/sysutils/wmain.c b/rosapps/applications/sysutils/wmain.c
similarity index 100%
rename from rosapps/sysutils/wmain.c
rename to rosapps/applications/sysutils/wmain.c
diff --git a/rosapps/winfile/Makefile.in b/rosapps/applications/winfile/Makefile.in
similarity index 100%
rename from rosapps/winfile/Makefile.in
rename to rosapps/applications/winfile/Makefile.in
diff --git a/rosapps/winfile/drivebar.bmp b/rosapps/applications/winfile/drivebar.bmp
similarity index 100%
rename from rosapps/winfile/drivebar.bmp
rename to rosapps/applications/winfile/drivebar.bmp
diff --git a/rosapps/winfile/images.bmp b/rosapps/applications/winfile/images.bmp
similarity index 100%
rename from rosapps/winfile/images.bmp
rename to rosapps/applications/winfile/images.bmp
diff --git a/rosapps/winfile/lang/cs-CZ.rc b/rosapps/applications/winfile/lang/cs-CZ.rc
similarity index 100%
rename from rosapps/winfile/lang/cs-CZ.rc
rename to rosapps/applications/winfile/lang/cs-CZ.rc
diff --git a/rosapps/winfile/lang/da-DK.rc b/rosapps/applications/winfile/lang/da-DK.rc
similarity index 100%
rename from rosapps/winfile/lang/da-DK.rc
rename to rosapps/applications/winfile/lang/da-DK.rc
diff --git a/rosapps/winfile/lang/de-DE.rc b/rosapps/applications/winfile/lang/de-DE.rc
similarity index 100%
rename from rosapps/winfile/lang/de-DE.rc
rename to rosapps/applications/winfile/lang/de-DE.rc
diff --git a/rosapps/winfile/lang/en-US.rc b/rosapps/applications/winfile/lang/en-US.rc
similarity index 100%
rename from rosapps/winfile/lang/en-US.rc
rename to rosapps/applications/winfile/lang/en-US.rc
diff --git a/rosapps/winfile/lang/es-ES.rc b/rosapps/applications/winfile/lang/es-ES.rc
similarity index 100%
rename from rosapps/winfile/lang/es-ES.rc
rename to rosapps/applications/winfile/lang/es-ES.rc
diff --git a/rosapps/winfile/lang/fr-FR.rc b/rosapps/applications/winfile/lang/fr-FR.rc
similarity index 100%
rename from rosapps/winfile/lang/fr-FR.rc
rename to rosapps/applications/winfile/lang/fr-FR.rc
diff --git a/rosapps/winfile/lang/hu-HU.rc b/rosapps/applications/winfile/lang/hu-HU.rc
similarity index 100%
rename from rosapps/winfile/lang/hu-HU.rc
rename to rosapps/applications/winfile/lang/hu-HU.rc
diff --git a/rosapps/winfile/lang/it-IT.rc b/rosapps/applications/winfile/lang/it-IT.rc
similarity index 100%
rename from rosapps/winfile/lang/it-IT.rc
rename to rosapps/applications/winfile/lang/it-IT.rc
diff --git a/rosapps/winfile/lang/ko-KR.rc b/rosapps/applications/winfile/lang/ko-KR.rc
similarity index 100%
rename from rosapps/winfile/lang/ko-KR.rc
rename to rosapps/applications/winfile/lang/ko-KR.rc
diff --git a/rosapps/winfile/lang/nb-NO.rc b/rosapps/applications/winfile/lang/nb-NO.rc
similarity index 100%
rename from rosapps/winfile/lang/nb-NO.rc
rename to rosapps/applications/winfile/lang/nb-NO.rc
diff --git a/rosapps/winfile/lang/nl-NL.rc b/rosapps/applications/winfile/lang/nl-NL.rc
similarity index 100%
rename from rosapps/winfile/lang/nl-NL.rc
rename to rosapps/applications/winfile/lang/nl-NL.rc
diff --git a/rosapps/winfile/lang/pl-PL.rc b/rosapps/applications/winfile/lang/pl-PL.rc
similarity index 100%
rename from rosapps/winfile/lang/pl-PL.rc
rename to rosapps/applications/winfile/lang/pl-PL.rc
diff --git a/rosapps/winfile/lang/pt-PT.rc b/rosapps/applications/winfile/lang/pt-PT.rc
similarity index 100%
rename from rosapps/winfile/lang/pt-PT.rc
rename to rosapps/applications/winfile/lang/pt-PT.rc
diff --git a/rosapps/winfile/lang/ru-RU.rc b/rosapps/applications/winfile/lang/ru-RU.rc
similarity index 100%
rename from rosapps/winfile/lang/ru-RU.rc
rename to rosapps/applications/winfile/lang/ru-RU.rc
diff --git a/rosapps/winfile/lang/sl-SI.rc b/rosapps/applications/winfile/lang/sl-SI.rc
similarity index 100%
rename from rosapps/winfile/lang/sl-SI.rc
rename to rosapps/applications/winfile/lang/sl-SI.rc
diff --git a/rosapps/winfile/lang/sv-SE.rc b/rosapps/applications/winfile/lang/sv-SE.rc
similarity index 100%
rename from rosapps/winfile/lang/sv-SE.rc
rename to rosapps/applications/winfile/lang/sv-SE.rc
diff --git a/rosapps/winfile/lang/tr-TR.rc b/rosapps/applications/winfile/lang/tr-TR.rc
similarity index 100%
rename from rosapps/winfile/lang/tr-TR.rc
rename to rosapps/applications/winfile/lang/tr-TR.rc
diff --git a/rosapps/winfile/lang/zh-CN.rc b/rosapps/applications/winfile/lang/zh-CN.rc
similarity index 100%
rename from rosapps/winfile/lang/zh-CN.rc
rename to rosapps/applications/winfile/lang/zh-CN.rc
diff --git a/rosapps/winfile/resource.h b/rosapps/applications/winfile/resource.h
similarity index 100%
rename from rosapps/winfile/resource.h
rename to rosapps/applications/winfile/resource.h
diff --git a/rosapps/winfile/rsrc.rc b/rosapps/applications/winfile/rsrc.rc
similarity index 100%
rename from rosapps/winfile/rsrc.rc
rename to rosapps/applications/winfile/rsrc.rc
diff --git a/rosapps/winfile/splitpath.c b/rosapps/applications/winfile/splitpath.c
similarity index 100%
rename from rosapps/winfile/splitpath.c
rename to rosapps/applications/winfile/splitpath.c
diff --git a/rosapps/winfile/toolbar.bmp b/rosapps/applications/winfile/toolbar.bmp
similarity index 100%
rename from rosapps/winfile/toolbar.bmp
rename to rosapps/applications/winfile/toolbar.bmp
diff --git a/rosapps/winfile/winefile.c b/rosapps/applications/winfile/winefile.c
similarity index 100%
rename from rosapps/winfile/winefile.c
rename to rosapps/applications/winfile/winefile.c
diff --git a/rosapps/winfile/winefile.h b/rosapps/applications/winfile/winefile.h
similarity index 100%
rename from rosapps/winfile/winefile.h
rename to rosapps/applications/winfile/winefile.h
diff --git a/rosapps/winfile/winefile.ico b/rosapps/applications/winfile/winefile.ico
similarity index 100%
rename from rosapps/winfile/winefile.ico
rename to rosapps/applications/winfile/winefile.ico
diff --git a/rosapps/winfile/winfile.rbuild b/rosapps/applications/winfile/winfile.rbuild
similarity index 100%
rename from rosapps/winfile/winfile.rbuild
rename to rosapps/applications/winfile/winfile.rbuild
diff --git a/rosapps/winver/winver.c b/rosapps/applications/winver/winver.c
similarity index 100%
rename from rosapps/winver/winver.c
rename to rosapps/applications/winver/winver.c
diff --git a/rosapps/winver/winver.rbuild b/rosapps/applications/winver/winver.rbuild
similarity index 100%
rename from rosapps/winver/winver.rbuild
rename to rosapps/applications/winver/winver.rbuild
diff --git a/rosapps/write/lang/bg-BG.rc b/rosapps/applications/write/lang/bg-BG.rc
similarity index 100%
rename from rosapps/write/lang/bg-BG.rc
rename to rosapps/applications/write/lang/bg-BG.rc
diff --git a/rosapps/write/lang/de-DE.rc b/rosapps/applications/write/lang/de-DE.rc
similarity index 100%
rename from rosapps/write/lang/de-DE.rc
rename to rosapps/applications/write/lang/de-DE.rc
diff --git a/rosapps/write/lang/en-US.rc b/rosapps/applications/write/lang/en-US.rc
similarity index 100%
rename from rosapps/write/lang/en-US.rc
rename to rosapps/applications/write/lang/en-US.rc
diff --git a/rosapps/write/lang/fr-FR.rc b/rosapps/applications/write/lang/fr-FR.rc
similarity index 100%
rename from rosapps/write/lang/fr-FR.rc
rename to rosapps/applications/write/lang/fr-FR.rc
diff --git a/rosapps/write/lang/ko-KR.rc b/rosapps/applications/write/lang/ko-KR.rc
similarity index 100%
rename from rosapps/write/lang/ko-KR.rc
rename to rosapps/applications/write/lang/ko-KR.rc
diff --git a/rosapps/write/lang/nb-NO.rc b/rosapps/applications/write/lang/nb-NO.rc
similarity index 100%
rename from rosapps/write/lang/nb-NO.rc
rename to rosapps/applications/write/lang/nb-NO.rc
diff --git a/rosapps/write/lang/nl-NL.rc b/rosapps/applications/write/lang/nl-NL.rc
similarity index 100%
rename from rosapps/write/lang/nl-NL.rc
rename to rosapps/applications/write/lang/nl-NL.rc
diff --git a/rosapps/write/lang/pl-PL.rc b/rosapps/applications/write/lang/pl-PL.rc
similarity index 100%
rename from rosapps/write/lang/pl-PL.rc
rename to rosapps/applications/write/lang/pl-PL.rc
diff --git a/rosapps/write/lang/ru-RU.rc b/rosapps/applications/write/lang/ru-RU.rc
similarity index 100%
rename from rosapps/write/lang/ru-RU.rc
rename to rosapps/applications/write/lang/ru-RU.rc
diff --git a/rosapps/write/lang/sk-SK.rc b/rosapps/applications/write/lang/sk-SK.rc
similarity index 100%
rename from rosapps/write/lang/sk-SK.rc
rename to rosapps/applications/write/lang/sk-SK.rc
diff --git a/rosapps/write/lang/sl-SI.rc b/rosapps/applications/write/lang/sl-SI.rc
similarity index 100%
rename from rosapps/write/lang/sl-SI.rc
rename to rosapps/applications/write/lang/sl-SI.rc
diff --git a/rosapps/write/lang/uk-UA.rc b/rosapps/applications/write/lang/uk-UA.rc
similarity index 100%
rename from rosapps/write/lang/uk-UA.rc
rename to rosapps/applications/write/lang/uk-UA.rc
diff --git a/rosapps/write/resources.h b/rosapps/applications/write/resources.h
similarity index 100%
rename from rosapps/write/resources.h
rename to rosapps/applications/write/resources.h
diff --git a/rosapps/write/rsrc.rc b/rosapps/applications/write/rsrc.rc
similarity index 100%
rename from rosapps/write/rsrc.rc
rename to rosapps/applications/write/rsrc.rc
diff --git a/rosapps/write/write.c b/rosapps/applications/write/write.c
similarity index 100%
rename from rosapps/write/write.c
rename to rosapps/applications/write/write.c
diff --git a/rosapps/write/write.rbuild b/rosapps/applications/write/write.rbuild
similarity index 100%
rename from rosapps/write/write.rbuild
rename to rosapps/applications/write/write.rbuild
diff --git a/rosapps/directory.rbuild b/rosapps/directory.rbuild
index 7abb18ab29c..458f3ad99c9 100644
--- a/rosapps/directory.rbuild
+++ b/rosapps/directory.rbuild
@@ -5,101 +5,23 @@
 		<xi:include href="applications/applications.rbuild" />
 	</directory>
 
-	<directory name="cmdutils">
-		<xi:include href="cmdutils/cmdutils.rbuild" />
-	</directory>
-
 	<directory name="demos">
 		<xi:include href="demos/directory.rbuild" />
 	</directory>
 
-	<directory name="devutils">
-		<xi:include href="devutils/directory.rbuild" />
-	</directory>
-
 	<directory name="dflat32">
 		<xi:include href="dflat32/dflat32.rbuild" />
 	</directory>
 
-	<directory name="downloader">
-		<xi:include href="downloader/downloader.rbuild" />
-	</directory>
-
 	<directory name="drivers">
 		<xi:include href="drivers/directory.rbuild" />
 	</directory>
 	
-	<directory name="fontview">
-		<xi:include href="fontview/fontview.rbuild" />
-	</directory>
-<!--
-	<directory name="fraginator">
-		<xi:include href="fraginator/fraginator.rbuild" />
-	</directory>
--->
-	<directory name="gettype">
-		<xi:include href="gettype/gettype.rbuild" />
-	</directory>
-
-	<directory name="imagesoft">
-		<xi:include href="imagesoft/imagesoft.rbuild" />
-	</directory>
-
 	<directory name="lib">
 		<xi:include href="lib/directory.rbuild" />
 	</directory>
 
-	<directory name="logevent">
-		<xi:include href="logevent/logevent.rbuild" />
-	</directory>
-
-	<directory name="magnify">
-		<xi:include href="magnify/magnify.rbuild" />
-	</directory>
-
-	<directory name="mc">
-		<xi:include href="mc/mc.rbuild" />
-	</directory>
-
-	<directory name="net">
-		<xi:include href="net/directory.rbuild" />
-	</directory>
-
-	<directory name="notevil">
-		<xi:include href="notevil/notevil.rbuild" />
-	</directory>
-
-	<!--
-	<directory name="packmgr">
-		<xi:include href="packmgr/directory.rbuild" />
-	</directory>
-	-->
-
-	<directory name="roshttpd">
-		<xi:include href="roshttpd/roshttpd.rbuild" />
-	</directory>
-
-	<directory name="screenshot">
-		<xi:include href="screenshot/screenshot.rbuild" />
-	</directory>
-
-	<directory name="sysutils">
-		<xi:include href="sysutils/sysutils.rbuild" />
-	</directory>
-
 	<directory name="templates">
 		<xi:include href="templates/directory.rbuild" />
 	</directory>
-
-	<directory name="winfile">
-		<xi:include href="winfile/winfile.rbuild" />
-	</directory>
-
-	<directory name="winver">
-		<xi:include href="winver/winver.rbuild" />
-	</directory>
-
-	<directory name="write">
-		<xi:include href="write/write.rbuild" />
-	</directory>
 </group>