Re-org config class