Updated

Reorganized the folders. Updated with the latest changes fro xCode.