Switch to use a clean1 prefix

And have prefixes as directories, not foo_