Major refactoring (CEL-1) of core components