Refactoring Android Classes