diff --git a/reactos/base/applications/applications.rbuild b/reactos/base/applications/applications.rbuild
index 0b711600ce6..05e053c5f1d 100644
--- a/reactos/base/applications/applications.rbuild
+++ b/reactos/base/applications/applications.rbuild
@@ -58,4 +58,7 @@
 <directory name="wordpad">
 	<xi:include href="wordpad/wordpad.rbuild" />
 </directory>
+<directory name="control">
+	<xi:include href="control/control.rbuild" />
+</directory>
 </group>
diff --git a/reactos/dll/cpl/control/Cz.rc b/reactos/base/applications/control/Cz.rc
similarity index 100%
rename from reactos/dll/cpl/control/Cz.rc
rename to reactos/base/applications/control/Cz.rc
diff --git a/reactos/dll/cpl/control/De.rc b/reactos/base/applications/control/De.rc
similarity index 100%
rename from reactos/dll/cpl/control/De.rc
rename to reactos/base/applications/control/De.rc
diff --git a/reactos/dll/cpl/control/Dk.rc b/reactos/base/applications/control/Dk.rc
similarity index 100%
rename from reactos/dll/cpl/control/Dk.rc
rename to reactos/base/applications/control/Dk.rc
diff --git a/reactos/dll/cpl/control/En.rc b/reactos/base/applications/control/En.rc
similarity index 100%
rename from reactos/dll/cpl/control/En.rc
rename to reactos/base/applications/control/En.rc
diff --git a/reactos/dll/cpl/control/Es.rc b/reactos/base/applications/control/Es.rc
similarity index 100%
rename from reactos/dll/cpl/control/Es.rc
rename to reactos/base/applications/control/Es.rc
diff --git a/reactos/dll/cpl/control/Gr.rc b/reactos/base/applications/control/Gr.rc
similarity index 100%
rename from reactos/dll/cpl/control/Gr.rc
rename to reactos/base/applications/control/Gr.rc
diff --git a/reactos/dll/cpl/control/Hu.rc b/reactos/base/applications/control/Hu.rc
similarity index 100%
rename from reactos/dll/cpl/control/Hu.rc
rename to reactos/base/applications/control/Hu.rc
diff --git a/reactos/dll/cpl/control/Ja.rc b/reactos/base/applications/control/Ja.rc
similarity index 100%
rename from reactos/dll/cpl/control/Ja.rc
rename to reactos/base/applications/control/Ja.rc
diff --git a/reactos/dll/cpl/control/Nl.rc b/reactos/base/applications/control/Nl.rc
similarity index 100%
rename from reactos/dll/cpl/control/Nl.rc
rename to reactos/base/applications/control/Nl.rc
diff --git a/reactos/dll/cpl/control/Pl.rc b/reactos/base/applications/control/Pl.rc
similarity index 100%
rename from reactos/dll/cpl/control/Pl.rc
rename to reactos/base/applications/control/Pl.rc
diff --git a/reactos/dll/cpl/control/Ru.rc b/reactos/base/applications/control/Ru.rc
similarity index 100%
rename from reactos/dll/cpl/control/Ru.rc
rename to reactos/base/applications/control/Ru.rc
diff --git a/reactos/dll/cpl/control/Sv.rc b/reactos/base/applications/control/Sv.rc
similarity index 100%
rename from reactos/dll/cpl/control/Sv.rc
rename to reactos/base/applications/control/Sv.rc
diff --git a/reactos/dll/cpl/control/control.c b/reactos/base/applications/control/control.c
similarity index 100%
rename from reactos/dll/cpl/control/control.c
rename to reactos/base/applications/control/control.c
diff --git a/reactos/dll/cpl/control/control.dsp b/reactos/base/applications/control/control.dsp
similarity index 100%
rename from reactos/dll/cpl/control/control.dsp
rename to reactos/base/applications/control/control.dsp
diff --git a/reactos/dll/cpl/control/control.dsw b/reactos/base/applications/control/control.dsw
similarity index 100%
rename from reactos/dll/cpl/control/control.dsw
rename to reactos/base/applications/control/control.dsw
diff --git a/reactos/dll/cpl/control/control.rbuild b/reactos/base/applications/control/control.rbuild
similarity index 100%
rename from reactos/dll/cpl/control/control.rbuild
rename to reactos/base/applications/control/control.rbuild
diff --git a/reactos/dll/cpl/control/control.rc b/reactos/base/applications/control/control.rc
similarity index 100%
rename from reactos/dll/cpl/control/control.rc
rename to reactos/base/applications/control/control.rc
diff --git a/reactos/dll/cpl/control/resource.h b/reactos/base/applications/control/resource.h
similarity index 100%
rename from reactos/dll/cpl/control/resource.h
rename to reactos/base/applications/control/resource.h
diff --git a/reactos/dll/cpl/control/resources/config.ico b/reactos/base/applications/control/resources/config.ico
similarity index 100%
rename from reactos/dll/cpl/control/resources/config.ico
rename to reactos/base/applications/control/resources/config.ico
diff --git a/reactos/boot/bootdata/packages/reactos.dff b/reactos/boot/bootdata/packages/reactos.dff
index 15aff8f2617..21a9e40d329 100755
--- a/reactos/boot/bootdata/packages/reactos.dff
+++ b/reactos/boot/bootdata/packages/reactos.dff
@@ -63,6 +63,7 @@ base\applications\taskmgr\taskmgr.exe               1
 ;base\applications\utils\ps\ps.exe                  1
 base\applications\winefile\winefile.exe             1
 ;base\applications\winver\winver.exe                1
+base\applications\control\control.exe               1
 
 base\services\dhcp\dhcp.exe                         1
 base\services\eventlog\eventlog.exe                 1
@@ -98,7 +99,6 @@ dll\3rdparty\mesa32\mesa32.dll                      1
 
 dll\cpl\access\access.cpl                           1
 dll\cpl\appwiz\appwiz.cpl                           1
-dll\cpl\control\control.exe                         1
 dll\cpl\desk\desk.cpl                               1
 dll\cpl\intl\intl.cpl                               1
 dll\cpl\main\main.cpl                               1
diff --git a/reactos/dll/cpl/cpl.rbuild b/reactos/dll/cpl/cpl.rbuild
index 4b3b6428dc0..73d9379a5af 100644
--- a/reactos/dll/cpl/cpl.rbuild
+++ b/reactos/dll/cpl/cpl.rbuild
@@ -4,9 +4,6 @@
 <directory name="appwiz">
 	<xi:include href="appwiz/appwiz.rbuild" />
 </directory>
-<directory name="control">
-	<xi:include href="control/control.rbuild" />
-</directory>
 <directory name="desk">
 	<xi:include href="desk/desk.rbuild" />
 </directory>