Updates for modern Objective-C and minor organization cleanup.