Small cleanups and refactoring towards SPI design
Renamed cdi extension