WIP tidy up and rename DefaultBuildSettings to Defaults