Move work item code back to core module.