diff --git a/reactos/dll/win32/console/colors.c b/reactos/dll/cpl/console/colors.c
similarity index 99%
rename from reactos/dll/win32/console/colors.c
rename to reactos/dll/cpl/console/colors.c
index 16eabd810a3..70018a71ca2 100644
--- a/reactos/dll/win32/console/colors.c
+++ b/reactos/dll/cpl/console/colors.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: colors.c 29690 2007-10-19 23:21:45Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/console.c b/reactos/dll/cpl/console/console.c
similarity index 99%
rename from reactos/dll/win32/console/console.c
rename to reactos/dll/cpl/console/console.c
index a170a029e3c..916219cc45d 100644
--- a/reactos/dll/win32/console/console.c
+++ b/reactos/dll/cpl/console/console.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: console.c 29690 2007-10-19 23:21:45Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/console.def b/reactos/dll/cpl/console/console.def
similarity index 100%
rename from reactos/dll/win32/console/console.def
rename to reactos/dll/cpl/console/console.def
diff --git a/reactos/dll/win32/console/console.h b/reactos/dll/cpl/console/console.h
similarity index 100%
rename from reactos/dll/win32/console/console.h
rename to reactos/dll/cpl/console/console.h
diff --git a/reactos/dll/win32/console/console.rbuild b/reactos/dll/cpl/console/console.rbuild
similarity index 100%
rename from reactos/dll/win32/console/console.rbuild
rename to reactos/dll/cpl/console/console.rbuild
diff --git a/reactos/dll/win32/console/console.rc b/reactos/dll/cpl/console/console.rc
similarity index 91%
rename from reactos/dll/win32/console/console.rc
rename to reactos/dll/cpl/console/console.rc
index 1f40b0d7bc7..7ee99b8d326 100644
--- a/reactos/dll/win32/console/console.rc
+++ b/reactos/dll/cpl/console/console.rc
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: console.rc 31672 2008-01-08 16:13:01Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/font.c b/reactos/dll/cpl/console/font.c
similarity index 95%
rename from reactos/dll/win32/console/font.c
rename to reactos/dll/cpl/console/font.c
index 6efb089f475..a80b6cc2316 100644
--- a/reactos/dll/win32/console/font.c
+++ b/reactos/dll/cpl/console/font.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: font.c 29690 2007-10-19 23:21:45Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/lang/de-DE.rc b/reactos/dll/cpl/console/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/de-DE.rc
rename to reactos/dll/cpl/console/lang/de-DE.rc
diff --git a/reactos/dll/win32/console/lang/en-US.rc b/reactos/dll/cpl/console/lang/en-US.rc
similarity index 99%
rename from reactos/dll/win32/console/lang/en-US.rc
rename to reactos/dll/cpl/console/lang/en-US.rc
index d01688df9dc..774acff1d7a 100644
--- a/reactos/dll/win32/console/lang/en-US.rc
+++ b/reactos/dll/cpl/console/lang/en-US.rc
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: en-US.rc 31950 2008-01-22 19:08:51Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/lang/es-ES.rc b/reactos/dll/cpl/console/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/es-ES.rc
rename to reactos/dll/cpl/console/lang/es-ES.rc
diff --git a/reactos/dll/win32/console/lang/id-ID.rc b/reactos/dll/cpl/console/lang/id-ID.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/id-ID.rc
rename to reactos/dll/cpl/console/lang/id-ID.rc
diff --git a/reactos/dll/win32/console/lang/it-IT.rc b/reactos/dll/cpl/console/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/it-IT.rc
rename to reactos/dll/cpl/console/lang/it-IT.rc
diff --git a/reactos/dll/win32/console/lang/pl-PL.rc b/reactos/dll/cpl/console/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/pl-PL.rc
rename to reactos/dll/cpl/console/lang/pl-PL.rc
diff --git a/reactos/dll/win32/console/lang/ru-RU.rc b/reactos/dll/cpl/console/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/ru-RU.rc
rename to reactos/dll/cpl/console/lang/ru-RU.rc
diff --git a/reactos/dll/win32/console/lang/uk-UA.rc b/reactos/dll/cpl/console/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/win32/console/lang/uk-UA.rc
rename to reactos/dll/cpl/console/lang/uk-UA.rc
diff --git a/reactos/dll/win32/console/layout.c b/reactos/dll/cpl/console/layout.c
similarity index 99%
rename from reactos/dll/win32/console/layout.c
rename to reactos/dll/cpl/console/layout.c
index 9def3f75924..a6179517b6a 100644
--- a/reactos/dll/win32/console/layout.c
+++ b/reactos/dll/cpl/console/layout.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: layout.c 29690 2007-10-19 23:21:45Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/options.c b/reactos/dll/cpl/console/options.c
similarity index 99%
rename from reactos/dll/win32/console/options.c
rename to reactos/dll/cpl/console/options.c
index ba1eac6e274..e6c3524a91c 100644
--- a/reactos/dll/win32/console/options.c
+++ b/reactos/dll/cpl/console/options.c
@@ -1,4 +1,4 @@
-/* $Id$
+/* $Id: options.c 29690 2007-10-19 23:21:45Z dreimer $
  *
  * PROJECT:         ReactOS Console Configuration DLL
  * LICENSE:         GPL - See COPYING in the top level directory
diff --git a/reactos/dll/win32/console/resource.h b/reactos/dll/cpl/console/resource.h
similarity index 100%
rename from reactos/dll/win32/console/resource.h
rename to reactos/dll/cpl/console/resource.h
diff --git a/reactos/dll/win32/console/rsrc.rc b/reactos/dll/cpl/console/rsrc.rc
similarity index 100%
rename from reactos/dll/win32/console/rsrc.rc
rename to reactos/dll/cpl/console/rsrc.rc
diff --git a/reactos/dll/cpl/cpl.rbuild b/reactos/dll/cpl/cpl.rbuild
index e5594349a86..afe420991bd 100644
--- a/reactos/dll/cpl/cpl.rbuild
+++ b/reactos/dll/cpl/cpl.rbuild
@@ -10,6 +10,9 @@
 <directory name="appwiz-new">
 	<xi:include href="appwiz-new/appwiz.rbuild" />
 </directory>
+<directory name="console">
+	<xi:include href="console/console.rbuild" />
+</directory>
 <directory name="desk">
 	<xi:include href="desk/desk.rbuild" />
 </directory>
diff --git a/reactos/dll/win32/win32.rbuild b/reactos/dll/win32/win32.rbuild
index cd1765dea5f..74fd436b8b9 100644
--- a/reactos/dll/win32/win32.rbuild
+++ b/reactos/dll/win32/win32.rbuild
@@ -40,9 +40,6 @@
 <directory name="clusapi">
 	<xi:include href="clusapi/clusapi.rbuild" />
 </directory>
-<directory name="console">
-	<xi:include href="console/console.rbuild" />
-</directory>
 <directory name="comcat">
 	<xi:include href="comcat/comcat.rbuild" />
 </directory>