Started to re-structure the CRS-related planning code.