diff --git a/reactos/drivers/drivers.rbuild b/reactos/drivers/drivers.rbuild
index ac42fb663fc..f8a52788590 100644
--- a/reactos/drivers/drivers.rbuild
+++ b/reactos/drivers/drivers.rbuild
@@ -11,9 +11,6 @@
 <directory name="input">
 	<xi:include href="input/directory.xml" />
 </directory>
-<directory name="lib">
-	<xi:include href="lib/directory.xml" />
-</directory>
 <directory name="multimedia">
 	<xi:include href="multimedia/directory.xml" />
 </directory>
diff --git a/reactos/drivers/lib/chew/chew.xml b/reactos/lib/drivers/chew/chew.xml
similarity index 100%
rename from reactos/drivers/lib/chew/chew.xml
rename to reactos/lib/drivers/chew/chew.xml
diff --git a/reactos/drivers/lib/chew/workqueue.c b/reactos/lib/drivers/chew/workqueue.c
similarity index 100%
rename from reactos/drivers/lib/chew/workqueue.c
rename to reactos/lib/drivers/chew/workqueue.c
diff --git a/reactos/drivers/lib/csq/SOURCES b/reactos/lib/drivers/csq/SOURCES
similarity index 100%
rename from reactos/drivers/lib/csq/SOURCES
rename to reactos/lib/drivers/csq/SOURCES
diff --git a/reactos/drivers/lib/csq/csq.c b/reactos/lib/drivers/csq/csq.c
similarity index 100%
rename from reactos/drivers/lib/csq/csq.c
rename to reactos/lib/drivers/csq/csq.c
diff --git a/reactos/drivers/lib/csq/csq.def b/reactos/lib/drivers/csq/csq.def
similarity index 100%
rename from reactos/drivers/lib/csq/csq.def
rename to reactos/lib/drivers/csq/csq.def
diff --git a/reactos/drivers/lib/csq/csq.h b/reactos/lib/drivers/csq/csq.h
similarity index 100%
rename from reactos/drivers/lib/csq/csq.h
rename to reactos/lib/drivers/csq/csq.h
diff --git a/reactos/drivers/lib/csq/csq.xml b/reactos/lib/drivers/csq/csq.xml
similarity index 100%
rename from reactos/drivers/lib/csq/csq.xml
rename to reactos/lib/drivers/csq/csq.xml
diff --git a/reactos/drivers/lib/directory.xml b/reactos/lib/drivers/directory.xml
similarity index 100%
rename from reactos/drivers/lib/directory.xml
rename to reactos/lib/drivers/directory.xml
diff --git a/reactos/drivers/lib/ip/ip.xml b/reactos/lib/drivers/ip/ip.xml
similarity index 100%
rename from reactos/drivers/lib/ip/ip.xml
rename to reactos/lib/drivers/ip/ip.xml
diff --git a/reactos/drivers/lib/ip/network/address.c b/reactos/lib/drivers/ip/network/address.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/address.c
rename to reactos/lib/drivers/ip/network/address.c
diff --git a/reactos/drivers/lib/ip/network/arp.c b/reactos/lib/drivers/ip/network/arp.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/arp.c
rename to reactos/lib/drivers/ip/network/arp.c
diff --git a/reactos/drivers/lib/ip/network/checksum.c b/reactos/lib/drivers/ip/network/checksum.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/checksum.c
rename to reactos/lib/drivers/ip/network/checksum.c
diff --git a/reactos/drivers/lib/ip/network/i386/checksum.S b/reactos/lib/drivers/ip/network/i386/checksum.S
similarity index 100%
rename from reactos/drivers/lib/ip/network/i386/checksum.S
rename to reactos/lib/drivers/ip/network/i386/checksum.S
diff --git a/reactos/drivers/lib/ip/network/icmp.c b/reactos/lib/drivers/ip/network/icmp.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/icmp.c
rename to reactos/lib/drivers/ip/network/icmp.c
diff --git a/reactos/drivers/lib/ip/network/interface.c b/reactos/lib/drivers/ip/network/interface.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/interface.c
rename to reactos/lib/drivers/ip/network/interface.c
diff --git a/reactos/drivers/lib/ip/network/ip.c b/reactos/lib/drivers/ip/network/ip.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/ip.c
rename to reactos/lib/drivers/ip/network/ip.c
diff --git a/reactos/drivers/lib/ip/network/loopback.c b/reactos/lib/drivers/ip/network/loopback.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/loopback.c
rename to reactos/lib/drivers/ip/network/loopback.c
diff --git a/reactos/drivers/lib/ip/network/memtrack.c b/reactos/lib/drivers/ip/network/memtrack.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/memtrack.c
rename to reactos/lib/drivers/ip/network/memtrack.c
diff --git a/reactos/drivers/lib/ip/network/neighbor.c b/reactos/lib/drivers/ip/network/neighbor.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/neighbor.c
rename to reactos/lib/drivers/ip/network/neighbor.c
diff --git a/reactos/drivers/lib/ip/network/ports.c b/reactos/lib/drivers/ip/network/ports.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/ports.c
rename to reactos/lib/drivers/ip/network/ports.c
diff --git a/reactos/drivers/lib/ip/network/receive.c b/reactos/lib/drivers/ip/network/receive.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/receive.c
rename to reactos/lib/drivers/ip/network/receive.c
diff --git a/reactos/drivers/lib/ip/network/router.c b/reactos/lib/drivers/ip/network/router.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/router.c
rename to reactos/lib/drivers/ip/network/router.c
diff --git a/reactos/drivers/lib/ip/network/routines.c b/reactos/lib/drivers/ip/network/routines.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/routines.c
rename to reactos/lib/drivers/ip/network/routines.c
diff --git a/reactos/drivers/lib/ip/network/transmit.c b/reactos/lib/drivers/ip/network/transmit.c
similarity index 100%
rename from reactos/drivers/lib/ip/network/transmit.c
rename to reactos/lib/drivers/ip/network/transmit.c
diff --git a/reactos/drivers/lib/ip/transport/datagram/datagram.c b/reactos/lib/drivers/ip/transport/datagram/datagram.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/datagram/datagram.c
rename to reactos/lib/drivers/ip/transport/datagram/datagram.c
diff --git a/reactos/drivers/lib/ip/transport/rawip/rawip.c b/reactos/lib/drivers/ip/transport/rawip/rawip.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/rawip/rawip.c
rename to reactos/lib/drivers/ip/transport/rawip/rawip.c
diff --git a/reactos/drivers/lib/ip/transport/tcp/accept.c b/reactos/lib/drivers/ip/transport/tcp/accept.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/tcp/accept.c
rename to reactos/lib/drivers/ip/transport/tcp/accept.c
diff --git a/reactos/drivers/lib/ip/transport/tcp/event.c b/reactos/lib/drivers/ip/transport/tcp/event.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/tcp/event.c
rename to reactos/lib/drivers/ip/transport/tcp/event.c
diff --git a/reactos/drivers/lib/ip/transport/tcp/if.c b/reactos/lib/drivers/ip/transport/tcp/if.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/tcp/if.c
rename to reactos/lib/drivers/ip/transport/tcp/if.c
diff --git a/reactos/drivers/lib/ip/transport/tcp/tcp.c b/reactos/lib/drivers/ip/transport/tcp/tcp.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/tcp/tcp.c
rename to reactos/lib/drivers/ip/transport/tcp/tcp.c
diff --git a/reactos/drivers/lib/ip/transport/udp/udp.c b/reactos/lib/drivers/ip/transport/udp/udp.c
similarity index 100%
rename from reactos/drivers/lib/ip/transport/udp/udp.c
rename to reactos/lib/drivers/ip/transport/udp/udp.c
diff --git a/reactos/drivers/lib/oskittcp/README b/reactos/lib/drivers/oskittcp/README
similarity index 100%
rename from reactos/drivers/lib/oskittcp/README
rename to reactos/lib/drivers/oskittcp/README
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/dev/include/vm/vm.h b/reactos/lib/drivers/oskittcp/include/freebsd/dev/include/vm/vm.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/dev/include/vm/vm.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/dev/include/vm/vm.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/dev/include/vm/vm_param.h b/reactos/lib/drivers/oskittcp/include/freebsd/dev/include/vm/vm_param.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/dev/include/vm/vm_param.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/dev/include/vm/vm_param.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/net/include/arpa/inet.h b/reactos/lib/drivers/oskittcp/include/freebsd/net/include/arpa/inet.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/net/include/arpa/inet.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/net/include/arpa/inet.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/net/include/imp.h b/reactos/lib/drivers/oskittcp/include/freebsd/net/include/imp.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/net/include/imp.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/net/include/imp.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/ansi.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ansi.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/ansi.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ansi.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/cpufunc.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/cpufunc.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/cpufunc.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/cpufunc.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/endian.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/endian.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/endian.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/ipl.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ipl.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/ipl.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/ipl.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/limits.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/limits.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/limits.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/limits.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/param.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/param.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/param.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/param.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/proc.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/proc.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/proc.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/proc.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/signal.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/signal.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/signal.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/signal.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/spl.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/spl.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/spl.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/stdarg.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/stdarg.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/stdarg.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/trap.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/trap.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/trap.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/trap.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/types.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/types.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/types.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/types.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/vmparam.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/vmparam.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/machine/vmparam.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/machine/vmparam.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/if.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/if.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/if.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/if.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/if_arp.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/if_arp.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/if_arp.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/if_arp.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/netisr.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/netisr.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/netisr.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/netisr.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/radix.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/radix.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/radix.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/radix.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/raw_cb.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/raw_cb.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/raw_cb.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/raw_cb.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/route.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/route.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/net/route.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/net/route.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/if_ether.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/if_ether.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/if_ether.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/if_ether.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/igmp_var.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/igmp_var.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/igmp_var.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/igmp_var.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in_pcb.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in_pcb.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in_pcb.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in_pcb.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in_systm.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in_systm.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in_systm.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in_systm.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in_var.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in_var.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/in_var.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/in_var.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip_fw.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip_fw.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip_fw.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip_fw.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip_icmp.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip_icmp.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip_icmp.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip_icmp.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip_var.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip_var.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/ip_var.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/ip_var.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_debug.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_debug.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_debug.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_debug.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_fsm.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_fsm.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_fsm.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_fsm.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_seq.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_seq.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_seq.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_seq.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_timer.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_timer.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_timer.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_timer.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_var.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_var.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcp_var.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcp_var.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcpip.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcpip.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/tcpip.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/tcpip.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/udp.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/udp.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/udp.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/udp.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/udp_var.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/udp_var.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/netinet/udp_var.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/netinet/udp_var.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/buf.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/buf.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/buf.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/buf.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/callout.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/callout.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/callout.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/callout.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/cdefs.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/cdefs.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/cdefs.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/cdefs.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/domain.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/domain.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/domain.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/domain.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/errno.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/errno.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/errno.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/errno.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/fcntl.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/fcntl.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/fcntl.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/fcntl.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/file.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/file.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/file.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/file.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/filedesc.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/filedesc.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/filedesc.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/filedesc.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/filio.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/filio.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/filio.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/filio.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ioccom.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ioccom.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ioccom.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ioccom.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ioctl.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ioctl.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ioctl.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ioctl.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/kernel.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/kernel.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/kernel.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/kernel.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/libkern.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/libkern.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/libkern.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/malloc.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/malloc.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/malloc.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/mbuf.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/mbuf.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/param.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/param.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/param.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/param.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/proc.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/proc.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/proc.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/protosw.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/protosw.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/protosw.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/protosw.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/queue.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/queue.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/queue.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/resource.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/resource.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/resource.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/resource.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/resourcevar.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/resourcevar.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/resourcevar.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/resourcevar.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/rtprio.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/rtprio.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/rtprio.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/rtprio.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/select.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/select.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/select.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/select.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/signal.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/signal.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/signal.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/signal.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/signalvar.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/signalvar.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/signalvar.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/signalvar.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socket.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/socket.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socket.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/socket.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socketvar.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/socketvar.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/socketvar.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/socketvar.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/sockio.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/sockio.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/sockio.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/sockio.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/stat.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/stat.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/stat.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/stat.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/sysctl.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/sysctl.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/sysctl.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/sysctl.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/syslimits.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/syslimits.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/syslimits.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/syslimits.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/syslog.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/syslog.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/syslog.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/syslog.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/systm.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/systm.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/time.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/time.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/time.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/time.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ttycom.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ttycom.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ttycom.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ttycom.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/types.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/types.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/types.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/types.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ucred.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ucred.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/ucred.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/ucred.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/uio.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/uio.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/uio.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/uio.h
diff --git a/reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/unistd.h b/reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/unistd.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/freebsd/src/sys/sys/unistd.h
rename to reactos/lib/drivers/oskittcp/include/freebsd/src/sys/sys/unistd.h
diff --git a/reactos/drivers/lib/oskittcp/include/memtrack.h b/reactos/lib/drivers/oskittcp/include/memtrack.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/memtrack.h
rename to reactos/lib/drivers/oskittcp/include/memtrack.h
diff --git a/reactos/drivers/lib/oskittcp/include/oskitdebug.h b/reactos/lib/drivers/oskittcp/include/oskitdebug.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/oskitdebug.h
rename to reactos/lib/drivers/oskittcp/include/oskitdebug.h
diff --git a/reactos/drivers/lib/oskittcp/include/oskiterrno.h b/reactos/lib/drivers/oskittcp/include/oskiterrno.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/oskiterrno.h
rename to reactos/lib/drivers/oskittcp/include/oskiterrno.h
diff --git a/reactos/drivers/lib/oskittcp/include/oskitfreebsd.h b/reactos/lib/drivers/oskittcp/include/oskitfreebsd.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/oskitfreebsd.h
rename to reactos/lib/drivers/oskittcp/include/oskitfreebsd.h
diff --git a/reactos/drivers/lib/oskittcp/include/oskittcp.h b/reactos/lib/drivers/oskittcp/include/oskittcp.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/oskittcp.h
rename to reactos/lib/drivers/oskittcp/include/oskittcp.h
diff --git a/reactos/drivers/lib/oskittcp/include/oskittypes.h b/reactos/lib/drivers/oskittcp/include/oskittypes.h
similarity index 100%
rename from reactos/drivers/lib/oskittcp/include/oskittypes.h
rename to reactos/lib/drivers/oskittcp/include/oskittypes.h
diff --git a/reactos/drivers/lib/oskittcp/notes.txt b/reactos/lib/drivers/oskittcp/notes.txt
similarity index 100%
rename from reactos/drivers/lib/oskittcp/notes.txt
rename to reactos/lib/drivers/oskittcp/notes.txt
diff --git a/reactos/drivers/lib/oskittcp/oskittcp.xml b/reactos/lib/drivers/oskittcp/oskittcp.xml
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp.xml
rename to reactos/lib/drivers/oskittcp/oskittcp.xml
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/defaults.c b/reactos/lib/drivers/oskittcp/oskittcp/defaults.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/defaults.c
rename to reactos/lib/drivers/oskittcp/oskittcp/defaults.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/in.c b/reactos/lib/drivers/oskittcp/oskittcp/in.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/in.c
rename to reactos/lib/drivers/oskittcp/oskittcp/in.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/in_cksum.c b/reactos/lib/drivers/oskittcp/oskittcp/in_cksum.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/in_cksum.c
rename to reactos/lib/drivers/oskittcp/oskittcp/in_cksum.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c b/reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/in_pcb.c
rename to reactos/lib/drivers/oskittcp/oskittcp/in_pcb.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/in_proto.c b/reactos/lib/drivers/oskittcp/oskittcp/in_proto.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/in_proto.c
rename to reactos/lib/drivers/oskittcp/oskittcp/in_proto.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/in_rmx.c b/reactos/lib/drivers/oskittcp/oskittcp/in_rmx.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/in_rmx.c
rename to reactos/lib/drivers/oskittcp/oskittcp/in_rmx.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/inet_ntoa.c b/reactos/lib/drivers/oskittcp/oskittcp/inet_ntoa.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/inet_ntoa.c
rename to reactos/lib/drivers/oskittcp/oskittcp/inet_ntoa.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/interface.c b/reactos/lib/drivers/oskittcp/oskittcp/interface.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/interface.c
rename to reactos/lib/drivers/oskittcp/oskittcp/interface.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/ip_input.c b/reactos/lib/drivers/oskittcp/oskittcp/ip_input.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/ip_input.c
rename to reactos/lib/drivers/oskittcp/oskittcp/ip_input.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/ip_output.c b/reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/ip_output.c
rename to reactos/lib/drivers/oskittcp/oskittcp/ip_output.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/kern_clock.c b/reactos/lib/drivers/oskittcp/oskittcp/kern_clock.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/kern_clock.c
rename to reactos/lib/drivers/oskittcp/oskittcp/kern_clock.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/kern_subr.c b/reactos/lib/drivers/oskittcp/oskittcp/kern_subr.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/kern_subr.c
rename to reactos/lib/drivers/oskittcp/oskittcp/kern_subr.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/param.c b/reactos/lib/drivers/oskittcp/oskittcp/param.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/param.c
rename to reactos/lib/drivers/oskittcp/oskittcp/param.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/radix.c b/reactos/lib/drivers/oskittcp/oskittcp/radix.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/radix.c
rename to reactos/lib/drivers/oskittcp/oskittcp/radix.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/random.c b/reactos/lib/drivers/oskittcp/oskittcp/random.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/random.c
rename to reactos/lib/drivers/oskittcp/oskittcp/random.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/raw_cb.c b/reactos/lib/drivers/oskittcp/oskittcp/raw_cb.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/raw_cb.c
rename to reactos/lib/drivers/oskittcp/oskittcp/raw_cb.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/raw_ip.c b/reactos/lib/drivers/oskittcp/oskittcp/raw_ip.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/raw_ip.c
rename to reactos/lib/drivers/oskittcp/oskittcp/raw_ip.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/raw_usrreq.c b/reactos/lib/drivers/oskittcp/oskittcp/raw_usrreq.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/raw_usrreq.c
rename to reactos/lib/drivers/oskittcp/oskittcp/raw_usrreq.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/route.c b/reactos/lib/drivers/oskittcp/oskittcp/route.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/route.c
rename to reactos/lib/drivers/oskittcp/oskittcp/route.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/rtsock.c b/reactos/lib/drivers/oskittcp/oskittcp/rtsock.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/rtsock.c
rename to reactos/lib/drivers/oskittcp/oskittcp/rtsock.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/scanc.c b/reactos/lib/drivers/oskittcp/oskittcp/scanc.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/scanc.c
rename to reactos/lib/drivers/oskittcp/oskittcp/scanc.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/sleep.c b/reactos/lib/drivers/oskittcp/oskittcp/sleep.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/sleep.c
rename to reactos/lib/drivers/oskittcp/oskittcp/sleep.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_debug.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_debug.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/tcp_debug.c
rename to reactos/lib/drivers/oskittcp/oskittcp/tcp_debug.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/tcp_input.c
rename to reactos/lib/drivers/oskittcp/oskittcp/tcp_input.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/tcp_output.c
rename to reactos/lib/drivers/oskittcp/oskittcp/tcp_output.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_subr.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/tcp_subr.c
rename to reactos/lib/drivers/oskittcp/oskittcp/tcp_subr.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_timer.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_timer.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/tcp_timer.c
rename to reactos/lib/drivers/oskittcp/oskittcp/tcp_timer.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/tcp_usrreq.c b/reactos/lib/drivers/oskittcp/oskittcp/tcp_usrreq.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/tcp_usrreq.c
rename to reactos/lib/drivers/oskittcp/oskittcp/tcp_usrreq.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_domain.c b/reactos/lib/drivers/oskittcp/oskittcp/uipc_domain.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/uipc_domain.c
rename to reactos/lib/drivers/oskittcp/oskittcp/uipc_domain.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c b/reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/uipc_mbuf.c
rename to reactos/lib/drivers/oskittcp/oskittcp/uipc_mbuf.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c b/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/uipc_socket.c
rename to reactos/lib/drivers/oskittcp/oskittcp/uipc_socket.c
diff --git a/reactos/drivers/lib/oskittcp/oskittcp/uipc_socket2.c b/reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c
similarity index 100%
rename from reactos/drivers/lib/oskittcp/oskittcp/uipc_socket2.c
rename to reactos/lib/drivers/oskittcp/oskittcp/uipc_socket2.c
diff --git a/reactos/drivers/lib/undis/include/ndisfake.h b/reactos/lib/drivers/undis/include/ndisfake.h
similarity index 100%
rename from reactos/drivers/lib/undis/include/ndisfake.h
rename to reactos/lib/drivers/undis/include/ndisfake.h
diff --git a/reactos/drivers/lib/undis/include/ndishack.h b/reactos/lib/drivers/undis/include/ndishack.h
similarity index 100%
rename from reactos/drivers/lib/undis/include/ndishack.h
rename to reactos/lib/drivers/undis/include/ndishack.h
diff --git a/reactos/drivers/lib/undis/include/ndissys.h b/reactos/lib/drivers/undis/include/ndissys.h
similarity index 100%
rename from reactos/drivers/lib/undis/include/ndissys.h
rename to reactos/lib/drivers/undis/include/ndissys.h
diff --git a/reactos/drivers/lib/undis/ndis/compat.c b/reactos/lib/drivers/undis/ndis/compat.c
similarity index 100%
rename from reactos/drivers/lib/undis/ndis/compat.c
rename to reactos/lib/drivers/undis/ndis/compat.c
diff --git a/reactos/drivers/lib/undis/undis.def b/reactos/lib/drivers/undis/undis.def
similarity index 100%
rename from reactos/drivers/lib/undis/undis.def
rename to reactos/lib/drivers/undis/undis.def
diff --git a/reactos/drivers/lib/undis/undis.rc b/reactos/lib/drivers/undis/undis.rc
similarity index 100%
rename from reactos/drivers/lib/undis/undis.rc
rename to reactos/lib/drivers/undis/undis.rc
diff --git a/reactos/lib/lib.rbuild b/reactos/lib/lib.rbuild
index 00a01676d2b..17aefb22c24 100644
--- a/reactos/lib/lib.rbuild
+++ b/reactos/lib/lib.rbuild
@@ -4,6 +4,9 @@
 <directory name="3rdparty">
 	<xi:include href="3rdparty/3rdparty.rbuild" />
 </directory>
+<directory name="drivers">
+	<xi:include href="drivers/directory.xml" />
+</directory>
 
 <directory name="crt">
 	<xi:include href="crt/crt.xml" />