Fleshing out of the directory tree even more, and update the config file to match.