Fix config dependencies
Reformat files
Use files map rather than individual files.