diff --git a/reactos/lib/directory.xml b/reactos/lib/directory.xml
index fc040f5f286..6286b801e2d 100644
--- a/reactos/lib/directory.xml
+++ b/reactos/lib/directory.xml
@@ -104,38 +104,8 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/reactos/lib/keyboard/directory.xml b/reactos/lib/keyboard/directory.xml
new file mode 100644
index 00000000000..086852a74db
--- /dev/null
+++ b/reactos/lib/keyboard/directory.xml
@@ -0,0 +1,35 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/reactos/lib/kbdbe/kbdbe.c b/reactos/lib/keyboard/kbdbe/kbdbe.c
similarity index 100%
rename from reactos/lib/kbdbe/kbdbe.c
rename to reactos/lib/keyboard/kbdbe/kbdbe.c
diff --git a/reactos/lib/kbdbe/kbdbe.def b/reactos/lib/keyboard/kbdbe/kbdbe.def
similarity index 100%
rename from reactos/lib/kbdbe/kbdbe.def
rename to reactos/lib/keyboard/kbdbe/kbdbe.def
diff --git a/reactos/lib/kbdbe/kbdbe.rc b/reactos/lib/keyboard/kbdbe/kbdbe.rc
similarity index 100%
rename from reactos/lib/kbdbe/kbdbe.rc
rename to reactos/lib/keyboard/kbdbe/kbdbe.rc
diff --git a/reactos/lib/kbdbe/kbdbe.xml b/reactos/lib/keyboard/kbdbe/kbdbe.xml
similarity index 100%
rename from reactos/lib/kbdbe/kbdbe.xml
rename to reactos/lib/keyboard/kbdbe/kbdbe.xml
diff --git a/reactos/lib/kbdda/kbdda.c b/reactos/lib/keyboard/kbdda/kbdda.c
similarity index 100%
rename from reactos/lib/kbdda/kbdda.c
rename to reactos/lib/keyboard/kbdda/kbdda.c
diff --git a/reactos/lib/kbdda/kbdda.def b/reactos/lib/keyboard/kbdda/kbdda.def
similarity index 100%
rename from reactos/lib/kbdda/kbdda.def
rename to reactos/lib/keyboard/kbdda/kbdda.def
diff --git a/reactos/lib/kbdda/kbdda.rc b/reactos/lib/keyboard/kbdda/kbdda.rc
similarity index 100%
rename from reactos/lib/kbdda/kbdda.rc
rename to reactos/lib/keyboard/kbdda/kbdda.rc
diff --git a/reactos/lib/kbdda/kbdda.xml b/reactos/lib/keyboard/kbdda/kbdda.xml
similarity index 100%
rename from reactos/lib/kbdda/kbdda.xml
rename to reactos/lib/keyboard/kbdda/kbdda.xml
diff --git a/reactos/lib/kbddv/kbddv.c b/reactos/lib/keyboard/kbddv/kbddv.c
similarity index 100%
rename from reactos/lib/kbddv/kbddv.c
rename to reactos/lib/keyboard/kbddv/kbddv.c
diff --git a/reactos/lib/kbddv/kbddv.def b/reactos/lib/keyboard/kbddv/kbddv.def
similarity index 100%
rename from reactos/lib/kbddv/kbddv.def
rename to reactos/lib/keyboard/kbddv/kbddv.def
diff --git a/reactos/lib/kbddv/kbddv.rc b/reactos/lib/keyboard/kbddv/kbddv.rc
similarity index 100%
rename from reactos/lib/kbddv/kbddv.rc
rename to reactos/lib/keyboard/kbddv/kbddv.rc
diff --git a/reactos/lib/kbddv/kbddv.xml b/reactos/lib/keyboard/kbddv/kbddv.xml
similarity index 100%
rename from reactos/lib/kbddv/kbddv.xml
rename to reactos/lib/keyboard/kbddv/kbddv.xml
diff --git a/reactos/lib/kbdes/kbdes.c b/reactos/lib/keyboard/kbdes/kbdes.c
similarity index 100%
rename from reactos/lib/kbdes/kbdes.c
rename to reactos/lib/keyboard/kbdes/kbdes.c
diff --git a/reactos/lib/kbdes/kbdes.def b/reactos/lib/keyboard/kbdes/kbdes.def
similarity index 100%
rename from reactos/lib/kbdes/kbdes.def
rename to reactos/lib/keyboard/kbdes/kbdes.def
diff --git a/reactos/lib/kbdes/kbdes.rc b/reactos/lib/keyboard/kbdes/kbdes.rc
similarity index 100%
rename from reactos/lib/kbdes/kbdes.rc
rename to reactos/lib/keyboard/kbdes/kbdes.rc
diff --git a/reactos/lib/kbdes/kbdes.xml b/reactos/lib/keyboard/kbdes/kbdes.xml
similarity index 100%
rename from reactos/lib/kbdes/kbdes.xml
rename to reactos/lib/keyboard/kbdes/kbdes.xml
diff --git a/reactos/lib/kbdfr/kbdfr.c b/reactos/lib/keyboard/kbdfr/kbdfr.c
similarity index 100%
rename from reactos/lib/kbdfr/kbdfr.c
rename to reactos/lib/keyboard/kbdfr/kbdfr.c
diff --git a/reactos/lib/kbdfr/kbdfr.def b/reactos/lib/keyboard/kbdfr/kbdfr.def
similarity index 100%
rename from reactos/lib/kbdfr/kbdfr.def
rename to reactos/lib/keyboard/kbdfr/kbdfr.def
diff --git a/reactos/lib/kbdfr/kbdfr.rc b/reactos/lib/keyboard/kbdfr/kbdfr.rc
similarity index 100%
rename from reactos/lib/kbdfr/kbdfr.rc
rename to reactos/lib/keyboard/kbdfr/kbdfr.rc
diff --git a/reactos/lib/kbdfr/kbdfr.xml b/reactos/lib/keyboard/kbdfr/kbdfr.xml
similarity index 100%
rename from reactos/lib/kbdfr/kbdfr.xml
rename to reactos/lib/keyboard/kbdfr/kbdfr.xml
diff --git a/reactos/lib/kbdgr/kbdgr.c b/reactos/lib/keyboard/kbdgr/kbdgr.c
similarity index 100%
rename from reactos/lib/kbdgr/kbdgr.c
rename to reactos/lib/keyboard/kbdgr/kbdgr.c
diff --git a/reactos/lib/kbdgr/kbdgr.def b/reactos/lib/keyboard/kbdgr/kbdgr.def
similarity index 100%
rename from reactos/lib/kbdgr/kbdgr.def
rename to reactos/lib/keyboard/kbdgr/kbdgr.def
diff --git a/reactos/lib/kbdgr/kbdgr.rc b/reactos/lib/keyboard/kbdgr/kbdgr.rc
similarity index 100%
rename from reactos/lib/kbdgr/kbdgr.rc
rename to reactos/lib/keyboard/kbdgr/kbdgr.rc
diff --git a/reactos/lib/kbdgr/kbdgr.xml b/reactos/lib/keyboard/kbdgr/kbdgr.xml
similarity index 100%
rename from reactos/lib/kbdgr/kbdgr.xml
rename to reactos/lib/keyboard/kbdgr/kbdgr.xml
diff --git a/reactos/lib/kbdru/kbdru.c b/reactos/lib/keyboard/kbdru/kbdru.c
similarity index 100%
rename from reactos/lib/kbdru/kbdru.c
rename to reactos/lib/keyboard/kbdru/kbdru.c
diff --git a/reactos/lib/kbdru/kbdru.def b/reactos/lib/keyboard/kbdru/kbdru.def
similarity index 100%
rename from reactos/lib/kbdru/kbdru.def
rename to reactos/lib/keyboard/kbdru/kbdru.def
diff --git a/reactos/lib/kbdru/kbdru.rc b/reactos/lib/keyboard/kbdru/kbdru.rc
similarity index 100%
rename from reactos/lib/kbdru/kbdru.rc
rename to reactos/lib/keyboard/kbdru/kbdru.rc
diff --git a/reactos/lib/kbdru/kbdru.xml b/reactos/lib/keyboard/kbdru/kbdru.xml
similarity index 100%
rename from reactos/lib/kbdru/kbdru.xml
rename to reactos/lib/keyboard/kbdru/kbdru.xml
diff --git a/reactos/lib/kbdse/kbdse.c b/reactos/lib/keyboard/kbdse/kbdse.c
similarity index 100%
rename from reactos/lib/kbdse/kbdse.c
rename to reactos/lib/keyboard/kbdse/kbdse.c
diff --git a/reactos/lib/kbdse/kbdse.def b/reactos/lib/keyboard/kbdse/kbdse.def
similarity index 100%
rename from reactos/lib/kbdse/kbdse.def
rename to reactos/lib/keyboard/kbdse/kbdse.def
diff --git a/reactos/lib/kbdse/kbdse.rc b/reactos/lib/keyboard/kbdse/kbdse.rc
similarity index 100%
rename from reactos/lib/kbdse/kbdse.rc
rename to reactos/lib/keyboard/kbdse/kbdse.rc
diff --git a/reactos/lib/kbdse/kbdse.xml b/reactos/lib/keyboard/kbdse/kbdse.xml
similarity index 100%
rename from reactos/lib/kbdse/kbdse.xml
rename to reactos/lib/keyboard/kbdse/kbdse.xml
diff --git a/reactos/lib/kbdsg/kbdsg.c b/reactos/lib/keyboard/kbdsg/kbdsg.c
similarity index 100%
rename from reactos/lib/kbdsg/kbdsg.c
rename to reactos/lib/keyboard/kbdsg/kbdsg.c
diff --git a/reactos/lib/kbdsg/kbdsg.def b/reactos/lib/keyboard/kbdsg/kbdsg.def
similarity index 100%
rename from reactos/lib/kbdsg/kbdsg.def
rename to reactos/lib/keyboard/kbdsg/kbdsg.def
diff --git a/reactos/lib/kbdsg/kbdsg.rc b/reactos/lib/keyboard/kbdsg/kbdsg.rc
similarity index 100%
rename from reactos/lib/kbdsg/kbdsg.rc
rename to reactos/lib/keyboard/kbdsg/kbdsg.rc
diff --git a/reactos/lib/kbdsg/kbdsg.xml b/reactos/lib/keyboard/kbdsg/kbdsg.xml
similarity index 100%
rename from reactos/lib/kbdsg/kbdsg.xml
rename to reactos/lib/keyboard/kbdsg/kbdsg.xml
diff --git a/reactos/lib/kbduk/kbduk.c b/reactos/lib/keyboard/kbduk/kbduk.c
similarity index 100%
rename from reactos/lib/kbduk/kbduk.c
rename to reactos/lib/keyboard/kbduk/kbduk.c
diff --git a/reactos/lib/kbduk/kbduk.def b/reactos/lib/keyboard/kbduk/kbduk.def
similarity index 100%
rename from reactos/lib/kbduk/kbduk.def
rename to reactos/lib/keyboard/kbduk/kbduk.def
diff --git a/reactos/lib/kbduk/kbduk.rc b/reactos/lib/keyboard/kbduk/kbduk.rc
similarity index 100%
rename from reactos/lib/kbduk/kbduk.rc
rename to reactos/lib/keyboard/kbduk/kbduk.rc
diff --git a/reactos/lib/kbduk/kbduk.xml b/reactos/lib/keyboard/kbduk/kbduk.xml
similarity index 100%
rename from reactos/lib/kbduk/kbduk.xml
rename to reactos/lib/keyboard/kbduk/kbduk.xml
diff --git a/reactos/lib/kbdus/kbdus.c b/reactos/lib/keyboard/kbdus/kbdus.c
similarity index 100%
rename from reactos/lib/kbdus/kbdus.c
rename to reactos/lib/keyboard/kbdus/kbdus.c
diff --git a/reactos/lib/kbdus/kbdus.def b/reactos/lib/keyboard/kbdus/kbdus.def
similarity index 100%
rename from reactos/lib/kbdus/kbdus.def
rename to reactos/lib/keyboard/kbdus/kbdus.def
diff --git a/reactos/lib/kbdus/kbdus.rc b/reactos/lib/keyboard/kbdus/kbdus.rc
similarity index 100%
rename from reactos/lib/kbdus/kbdus.rc
rename to reactos/lib/keyboard/kbdus/kbdus.rc
diff --git a/reactos/lib/kbdus/kbdus.xml b/reactos/lib/keyboard/kbdus/kbdus.xml
similarity index 100%
rename from reactos/lib/kbdus/kbdus.xml
rename to reactos/lib/keyboard/kbdus/kbdus.xml