Refactoring CoreData files