Complete overhaul of core to enable tighter integration with cdi and tools4j-config