Move NSManagedObjectContext category over to Data group, and standardize category name.