[dev] Refactored config classes to keeep related config together.