Making categories safe be adding cl preffix all over the place
adding renamed files
Fix xcodeproj after renames