Building out setup logic
Cleans up the way that config includes are added.