diff --git a/Kernel/build-root-filesystem.sh b/Kernel/build-root-filesystem.sh
index 90b753c6cf7..b94de4b4c4b 100755
--- a/Kernel/build-root-filesystem.sh
+++ b/Kernel/build-root-filesystem.sh
@@ -129,14 +129,12 @@ cp ../Applications/FileManager/FileManager mnt/bin/FileManager
 cp ../Applications/FontEditor/FontEditor mnt/bin/FontEditor
 cp ../Applications/IRCClient/IRCClient mnt/bin/IRCClient
 cp ../Applications/SystemMonitor/SystemMonitor mnt/bin/SystemMonitor
-cp ../Applications/Taskbar/Taskbar mnt/bin/Taskbar
 cp ../Applications/Terminal/Terminal mnt/bin/Terminal
 cp ../Applications/TextEditor/TextEditor mnt/bin/TextEditor
 cp ../Applications/HexEditor/HexEditor mnt/bin/HexEditor
 cp ../Applications/PaintBrush/PaintBrush mnt/bin/PaintBrush
 cp ../Applications/QuickShow/QuickShow mnt/bin/QuickShow
 cp ../Applications/Piano/Piano mnt/bin/Piano
-cp ../Applications/SystemMenu/SystemMenu mnt/bin/SystemMenu
 cp ../Applications/Calculator/Calculator mnt/bin/Calculator
 cp ../Applications/Calendar/Calendar mnt/bin/Calendar
 cp ../Applications/SoundPlayer/SoundPlayer mnt/bin/SoundPlayer
@@ -165,8 +163,10 @@ cp ../Services/SystemServer/SystemServer mnt/bin/SystemServer
 cp ../Services/WindowServer/WindowServer mnt/bin/WindowServer
 cp ../Services/AudioServer/AudioServer mnt/bin/AudioServer
 cp ../Services/TTYServer/TTYServer mnt/bin/TTYServer
+cp ../Services/Taskbar/Taskbar mnt/bin/Taskbar
 cp ../Services/TelnetServer/TelnetServer mnt/bin/TelnetServer
 cp ../Services/ProtocolServer/ProtocolServer mnt/bin/ProtocolServer
+cp ../Services/SystemMenu/SystemMenu mnt/bin/SystemMenu
 cp ../Services/NotificationServer/NotificationServer mnt/bin/NotificationServer
 cp ../Services/WebServer/WebServer mnt/bin/WebServer
 cp ../Shell/Shell mnt/bin/Shell
diff --git a/Applications/SystemMenu/Makefile b/Services/SystemMenu/Makefile
similarity index 100%
rename from Applications/SystemMenu/Makefile
rename to Services/SystemMenu/Makefile
diff --git a/Applications/SystemMenu/PowerDialog.cpp b/Services/SystemMenu/PowerDialog.cpp
similarity index 100%
rename from Applications/SystemMenu/PowerDialog.cpp
rename to Services/SystemMenu/PowerDialog.cpp
diff --git a/Applications/SystemMenu/PowerDialog.h b/Services/SystemMenu/PowerDialog.h
similarity index 100%
rename from Applications/SystemMenu/PowerDialog.h
rename to Services/SystemMenu/PowerDialog.h
diff --git a/Applications/SystemMenu/main.cpp b/Services/SystemMenu/main.cpp
similarity index 100%
rename from Applications/SystemMenu/main.cpp
rename to Services/SystemMenu/main.cpp
diff --git a/Applications/Taskbar/Makefile b/Services/Taskbar/Makefile
similarity index 100%
rename from Applications/Taskbar/Makefile
rename to Services/Taskbar/Makefile
diff --git a/Applications/Taskbar/TaskbarButton.cpp b/Services/Taskbar/TaskbarButton.cpp
similarity index 100%
rename from Applications/Taskbar/TaskbarButton.cpp
rename to Services/Taskbar/TaskbarButton.cpp
diff --git a/Applications/Taskbar/TaskbarButton.h b/Services/Taskbar/TaskbarButton.h
similarity index 100%
rename from Applications/Taskbar/TaskbarButton.h
rename to Services/Taskbar/TaskbarButton.h
diff --git a/Applications/Taskbar/TaskbarWindow.cpp b/Services/Taskbar/TaskbarWindow.cpp
similarity index 100%
rename from Applications/Taskbar/TaskbarWindow.cpp
rename to Services/Taskbar/TaskbarWindow.cpp
diff --git a/Applications/Taskbar/TaskbarWindow.h b/Services/Taskbar/TaskbarWindow.h
similarity index 100%
rename from Applications/Taskbar/TaskbarWindow.h
rename to Services/Taskbar/TaskbarWindow.h
diff --git a/Applications/Taskbar/WindowIdentifier.h b/Services/Taskbar/WindowIdentifier.h
similarity index 100%
rename from Applications/Taskbar/WindowIdentifier.h
rename to Services/Taskbar/WindowIdentifier.h
diff --git a/Applications/Taskbar/WindowList.cpp b/Services/Taskbar/WindowList.cpp
similarity index 100%
rename from Applications/Taskbar/WindowList.cpp
rename to Services/Taskbar/WindowList.cpp
diff --git a/Applications/Taskbar/WindowList.h b/Services/Taskbar/WindowList.h
similarity index 100%
rename from Applications/Taskbar/WindowList.h
rename to Services/Taskbar/WindowList.h
diff --git a/Applications/Taskbar/main.cpp b/Services/Taskbar/main.cpp
similarity index 100%
rename from Applications/Taskbar/main.cpp
rename to Services/Taskbar/main.cpp