Moved config to core
Modularity++
More closured