Removed everything from Config, created proper classes