Improved layout of xcode project