Updated Android App with correct classes