Updates Config to account for new file locations/names
Cleanup