Merge "Rename DirState -> Config to avoid confusion with State." into nyc-andromeda-dev