Fixed a bug, more refactoring, now really removed the ObjC files.