diff --git a/lib/uart/juart_rx.vhd b/lib/uart/src/generic/juart/juart_rx.vhd
similarity index 100%
rename from lib/uart/juart_rx.vhd
rename to lib/uart/src/generic/juart/juart_rx.vhd
diff --git a/lib/uart/juart_tx.vhd b/lib/uart/src/generic/juart/juart_tx.vhd
similarity index 100%
rename from lib/uart/juart_tx.vhd
rename to lib/uart/src/generic/juart/juart_tx.vhd
diff --git a/lib/uart/tb_juart_rx.vhd b/lib/uart/src/generic/juart/tb_juart_rx.vhd
similarity index 100%
rename from lib/uart/tb_juart_rx.vhd
rename to lib/uart/src/generic/juart/tb_juart_rx.vhd
diff --git a/lib/uart/tb_juart_tx.vhd b/lib/uart/src/generic/juart/tb_juart_tx.vhd
similarity index 100%
rename from lib/uart/tb_juart_tx.vhd
rename to lib/uart/src/generic/juart/tb_juart_tx.vhd
diff --git a/lib/uart/tb_juart_tx_rx.vhd b/lib/uart/src/generic/juart/tb_juart_tx_rx.vhd
similarity index 100%
rename from lib/uart/tb_juart_tx_rx.vhd
rename to lib/uart/src/generic/juart/tb_juart_tx_rx.vhd
diff --git a/lib/uart/uart.vhd b/lib/uart/src/generic/uart.vhd
similarity index 100%
rename from lib/uart/uart.vhd
rename to lib/uart/src/generic/uart.vhd
diff --git a/lib/uart/uart_rx.vhd b/lib/uart/src/generic/uart_rx.vhd
similarity index 100%
rename from lib/uart/uart_rx.vhd
rename to lib/uart/src/generic/uart_rx.vhd
diff --git a/lib/uart/uart_tx.vhd b/lib/uart/src/generic/uart_tx.vhd
similarity index 100%
rename from lib/uart/uart_tx.vhd
rename to lib/uart/src/generic/uart_tx.vhd
diff --git a/lib/uart/uart_sim.vhd b/lib/uart/src/sim/uart.vhd
similarity index 100%
rename from lib/uart/uart_sim.vhd
rename to lib/uart/src/sim/uart.vhd
diff --git a/lib/uart/tb_uart.vhd b/lib/uart/src/tb_uart.vhd
similarity index 100%
rename from lib/uart/tb_uart.vhd
rename to lib/uart/src/tb_uart.vhd
diff --git a/lib/uart/uart_jtag.vhd b/lib/uart/src/uart_jtag.vhd
similarity index 100%
rename from lib/uart/uart_jtag.vhd
rename to lib/uart/src/uart_jtag.vhd
diff --git a/lib/uart/uart_types.vhd b/lib/uart/src/uart_types.vhd
similarity index 100%
rename from lib/uart/uart_types.vhd
rename to lib/uart/src/uart_types.vhd
diff --git a/lib/uart/uart_wb.vhd b/lib/uart/src/uart_wb.vhd
similarity index 100%
rename from lib/uart/uart_wb.vhd
rename to lib/uart/src/uart_wb.vhd
diff --git a/lib/uart/bbfifo_16x8.vhd b/lib/uart/src/xilinx/kcuart/bbfifo_16x8.vhd
similarity index 100%
rename from lib/uart/bbfifo_16x8.vhd
rename to lib/uart/src/xilinx/kcuart/bbfifo_16x8.vhd
diff --git a/lib/uart/kcuart_rx.vhd b/lib/uart/src/xilinx/kcuart/kcuart_rx.vhd
similarity index 100%
rename from lib/uart/kcuart_rx.vhd
rename to lib/uart/src/xilinx/kcuart/kcuart_rx.vhd
diff --git a/lib/uart/kcuart_tx.vhd b/lib/uart/src/xilinx/kcuart/kcuart_tx.vhd
similarity index 100%
rename from lib/uart/kcuart_tx.vhd
rename to lib/uart/src/xilinx/kcuart/kcuart_tx.vhd
diff --git a/lib/uart/uart_xil.vhd b/lib/uart/src/xilinx/uart.vhd
similarity index 100%
rename from lib/uart/uart_xil.vhd
rename to lib/uart/src/xilinx/uart.vhd
diff --git a/lib/uart/uart_rx_xil.vhd b/lib/uart/src/xilinx/uart_rx.vhd
similarity index 100%
rename from lib/uart/uart_rx_xil.vhd
rename to lib/uart/src/xilinx/uart_rx.vhd
diff --git a/lib/uart/uart_tx_xil.vhd b/lib/uart/src/xilinx/uart_tx.vhd
similarity index 100%
rename from lib/uart/uart_tx_xil.vhd
rename to lib/uart/src/xilinx/uart_tx.vhd