android project refactoring