Refractoring (removing old BB classes and make it more android code)