New configuration framework

New configuration framework, which simplifies code a lot. Should be fully compatible with the old one.
Then can you try making one an inner class of the other?