Updates to CI-based, 2014 structure.