Removing logic from places it doesn't belong
Fix merge conflict
Moved generated CoreData models into their own group
Remvoed extraneous project files