Modifying the structure of the core package to reflect the way the new CORL architecture will process it.