refactorings, options extracted, android project