refactored configuration objects, parsers, etc