Core project rework