HeldCore -> SpACore + move packages