Changing configuration around to be a bit more logical, and fixing an inconsistency in folder names