Tested UART code and tweaking source layout