Tidy up some comments
Moving directories for config