refactoring for android project