Simplify configuration structure (not finished yet)