Combining config files
Change from account ID-based to name based
Updating documentation