Xcode files
Refactor