diff --git a/reactos/dll/cpl/CMakeLists.txt b/reactos/dll/cpl/CMakeLists.txt
index ed15887f04b..70a79d3e5ea 100644
--- a/reactos/dll/cpl/CMakeLists.txt
+++ b/reactos/dll/cpl/CMakeLists.txt
@@ -6,7 +6,6 @@ add_subdirectory(desk)
 add_subdirectory(hdwwiz)
 add_subdirectory(inetcpl)
 add_subdirectory(input)
-#add_subdirectory(input_new)
 add_subdirectory(intl)
 add_subdirectory(joy)
 #add_subdirectory(liccpa)#disabled in trunk
diff --git a/reactos/dll/cpl/input_new/CMakeLists.txt b/reactos/dll/cpl/input/CMakeLists.txt
similarity index 52%
rename from reactos/dll/cpl/input_new/CMakeLists.txt
rename to reactos/dll/cpl/input/CMakeLists.txt
index 999192f26ad..b9cecb1c2fa 100644
--- a/reactos/dll/cpl/input_new/CMakeLists.txt
+++ b/reactos/dll/cpl/input/CMakeLists.txt
@@ -1,6 +1,5 @@
-PROJECT(INPUT_NEW)
 
-spec2def(input_new.dll input.spec)
+spec2def(input.dll input.spec)
 
 list(APPEND SOURCE
     input.c
@@ -20,12 +19,12 @@ list(APPEND SOURCE
 
 add_rc_deps(input.rc ${CMAKE_CURRENT_SOURCE_DIR}/resources/keyboard-shortcuts.ico)
 
-add_library(input_new SHARED
+add_library(input SHARED
     ${SOURCE}
     input.rc
-    ${CMAKE_CURRENT_BINARY_DIR}/input_new.def)
+    ${CMAKE_CURRENT_BINARY_DIR}/input.def)
 
-set_module_type(input_new win32dll UNICODE)
-add_importlibs(input_new advapi32 user32 comctl32 gdi32 msvcrt kernel32 setupapi)
-add_pch(input_new input.h SOURCE)
-add_cd_file(TARGET input_new DESTINATION reactos/system32 FOR all)
+set_module_type(input win32dll UNICODE)
+add_importlibs(input advapi32 user32 comctl32 gdi32 msvcrt kernel32 setupapi)
+add_pch(input input.h SOURCE)
+add_cd_file(TARGET input DESTINATION reactos/system32 FOR all)
diff --git a/reactos/dll/cpl/input_new/add_dialog.c b/reactos/dll/cpl/input/add_dialog.c
similarity index 100%
rename from reactos/dll/cpl/input_new/add_dialog.c
rename to reactos/dll/cpl/input/add_dialog.c
diff --git a/reactos/dll/cpl/input_new/advanced_settings_page.c b/reactos/dll/cpl/input/advanced_settings_page.c
similarity index 100%
rename from reactos/dll/cpl/input_new/advanced_settings_page.c
rename to reactos/dll/cpl/input/advanced_settings_page.c
diff --git a/reactos/dll/cpl/input_new/edit_dialog.c b/reactos/dll/cpl/input/edit_dialog.c
similarity index 100%
rename from reactos/dll/cpl/input_new/edit_dialog.c
rename to reactos/dll/cpl/input/edit_dialog.c
diff --git a/reactos/dll/cpl/input_new/input.c b/reactos/dll/cpl/input/input.c
similarity index 100%
rename from reactos/dll/cpl/input_new/input.c
rename to reactos/dll/cpl/input/input.c
diff --git a/reactos/dll/cpl/input_new/input.h b/reactos/dll/cpl/input/input.h
similarity index 100%
rename from reactos/dll/cpl/input_new/input.h
rename to reactos/dll/cpl/input/input.h
diff --git a/reactos/dll/cpl/input_new/input.rc b/reactos/dll/cpl/input/input.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/input.rc
rename to reactos/dll/cpl/input/input.rc
diff --git a/reactos/dll/cpl/input_new/input.spec b/reactos/dll/cpl/input/input.spec
similarity index 100%
rename from reactos/dll/cpl/input_new/input.spec
rename to reactos/dll/cpl/input/input.spec
diff --git a/reactos/dll/cpl/input_new/input_list.c b/reactos/dll/cpl/input/input_list.c
similarity index 100%
rename from reactos/dll/cpl/input_new/input_list.c
rename to reactos/dll/cpl/input/input_list.c
diff --git a/reactos/dll/cpl/input_new/input_list.h b/reactos/dll/cpl/input/input_list.h
similarity index 100%
rename from reactos/dll/cpl/input_new/input_list.h
rename to reactos/dll/cpl/input/input_list.h
diff --git a/reactos/dll/cpl/input_new/key_sequence_dialog.c b/reactos/dll/cpl/input/key_sequence_dialog.c
similarity index 100%
rename from reactos/dll/cpl/input_new/key_sequence_dialog.c
rename to reactos/dll/cpl/input/key_sequence_dialog.c
diff --git a/reactos/dll/cpl/input_new/key_settings_dialog.c b/reactos/dll/cpl/input/key_settings_dialog.c
similarity index 100%
rename from reactos/dll/cpl/input_new/key_settings_dialog.c
rename to reactos/dll/cpl/input/key_settings_dialog.c
diff --git a/reactos/dll/cpl/input_new/lang/bg-BG.rc b/reactos/dll/cpl/input/lang/bg-BG.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/bg-BG.rc
rename to reactos/dll/cpl/input/lang/bg-BG.rc
diff --git a/reactos/dll/cpl/input_new/lang/cs-CZ.rc b/reactos/dll/cpl/input/lang/cs-CZ.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/cs-CZ.rc
rename to reactos/dll/cpl/input/lang/cs-CZ.rc
diff --git a/reactos/dll/cpl/input_new/lang/de-DE.rc b/reactos/dll/cpl/input/lang/de-DE.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/de-DE.rc
rename to reactos/dll/cpl/input/lang/de-DE.rc
diff --git a/reactos/dll/cpl/input_new/lang/el-GR.rc b/reactos/dll/cpl/input/lang/el-GR.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/el-GR.rc
rename to reactos/dll/cpl/input/lang/el-GR.rc
diff --git a/reactos/dll/cpl/input_new/lang/en-US.rc b/reactos/dll/cpl/input/lang/en-US.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/en-US.rc
rename to reactos/dll/cpl/input/lang/en-US.rc
diff --git a/reactos/dll/cpl/input_new/lang/es-ES.rc b/reactos/dll/cpl/input/lang/es-ES.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/es-ES.rc
rename to reactos/dll/cpl/input/lang/es-ES.rc
diff --git a/reactos/dll/cpl/input_new/lang/fr-FR.rc b/reactos/dll/cpl/input/lang/fr-FR.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/fr-FR.rc
rename to reactos/dll/cpl/input/lang/fr-FR.rc
diff --git a/reactos/dll/cpl/input_new/lang/he-IL.rc b/reactos/dll/cpl/input/lang/he-IL.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/he-IL.rc
rename to reactos/dll/cpl/input/lang/he-IL.rc
diff --git a/reactos/dll/cpl/input_new/lang/it-IT.rc b/reactos/dll/cpl/input/lang/it-IT.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/it-IT.rc
rename to reactos/dll/cpl/input/lang/it-IT.rc
diff --git a/reactos/dll/cpl/input_new/lang/no-NO.rc b/reactos/dll/cpl/input/lang/no-NO.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/no-NO.rc
rename to reactos/dll/cpl/input/lang/no-NO.rc
diff --git a/reactos/dll/cpl/input_new/lang/pl-PL.rc b/reactos/dll/cpl/input/lang/pl-PL.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/pl-PL.rc
rename to reactos/dll/cpl/input/lang/pl-PL.rc
diff --git a/reactos/dll/cpl/input_new/lang/pt-BR.rc b/reactos/dll/cpl/input/lang/pt-BR.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/pt-BR.rc
rename to reactos/dll/cpl/input/lang/pt-BR.rc
diff --git a/reactos/dll/cpl/input_new/lang/ro-RO.rc b/reactos/dll/cpl/input/lang/ro-RO.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/ro-RO.rc
rename to reactos/dll/cpl/input/lang/ro-RO.rc
diff --git a/reactos/dll/cpl/input_new/lang/ru-RU.rc b/reactos/dll/cpl/input/lang/ru-RU.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/ru-RU.rc
rename to reactos/dll/cpl/input/lang/ru-RU.rc
diff --git a/reactos/dll/cpl/input_new/lang/sk-SK.rc b/reactos/dll/cpl/input/lang/sk-SK.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/sk-SK.rc
rename to reactos/dll/cpl/input/lang/sk-SK.rc
diff --git a/reactos/dll/cpl/input_new/lang/sq-AL.rc b/reactos/dll/cpl/input/lang/sq-AL.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/sq-AL.rc
rename to reactos/dll/cpl/input/lang/sq-AL.rc
diff --git a/reactos/dll/cpl/input_new/lang/tr-TR.rc b/reactos/dll/cpl/input/lang/tr-TR.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/tr-TR.rc
rename to reactos/dll/cpl/input/lang/tr-TR.rc
diff --git a/reactos/dll/cpl/input_new/lang/uk-UA.rc b/reactos/dll/cpl/input/lang/uk-UA.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/uk-UA.rc
rename to reactos/dll/cpl/input/lang/uk-UA.rc
diff --git a/reactos/dll/cpl/input_new/lang/zh-CN.rc b/reactos/dll/cpl/input/lang/zh-CN.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/zh-CN.rc
rename to reactos/dll/cpl/input/lang/zh-CN.rc
diff --git a/reactos/dll/cpl/input_new/lang/zh-TW.rc b/reactos/dll/cpl/input/lang/zh-TW.rc
similarity index 100%
rename from reactos/dll/cpl/input_new/lang/zh-TW.rc
rename to reactos/dll/cpl/input/lang/zh-TW.rc
diff --git a/reactos/dll/cpl/input_new/layout_list.c b/reactos/dll/cpl/input/layout_list.c
similarity index 100%
rename from reactos/dll/cpl/input_new/layout_list.c
rename to reactos/dll/cpl/input/layout_list.c
diff --git a/reactos/dll/cpl/input_new/layout_list.h b/reactos/dll/cpl/input/layout_list.h
similarity index 100%
rename from reactos/dll/cpl/input_new/layout_list.h
rename to reactos/dll/cpl/input/layout_list.h
diff --git a/reactos/dll/cpl/input_new/locale_list.c b/reactos/dll/cpl/input/locale_list.c
similarity index 100%
rename from reactos/dll/cpl/input_new/locale_list.c
rename to reactos/dll/cpl/input/locale_list.c
diff --git a/reactos/dll/cpl/input_new/locale_list.h b/reactos/dll/cpl/input/locale_list.h
similarity index 100%
rename from reactos/dll/cpl/input_new/locale_list.h
rename to reactos/dll/cpl/input/locale_list.h
diff --git a/reactos/dll/cpl/input_new/resource.h b/reactos/dll/cpl/input/resource.h
similarity index 100%
rename from reactos/dll/cpl/input_new/resource.h
rename to reactos/dll/cpl/input/resource.h
diff --git a/reactos/dll/cpl/input_new/resources/keyboard-shortcuts.ico b/reactos/dll/cpl/input/resources/keyboard-shortcuts.ico
similarity index 100%
rename from reactos/dll/cpl/input_new/resources/keyboard-shortcuts.ico
rename to reactos/dll/cpl/input/resources/keyboard-shortcuts.ico
diff --git a/reactos/dll/cpl/input_new/settings_page.c b/reactos/dll/cpl/input/settings_page.c
similarity index 100%
rename from reactos/dll/cpl/input_new/settings_page.c
rename to reactos/dll/cpl/input/settings_page.c