Adding CEP Tools classes and more restructuring