XCode 4 refactoring, +more modularization