Reorganised files and fixed Xcode warnings.