Refactored config file structure