Adding classes refactring
Added bluetooth