Added bluetooth state and made project more module