add new configuration classes

Prepare refactoring with new class structure.