Add some more files for BT/UART interface duplication
Start modifiyng mapping