Added files from bluetooth branch