Enforce better discipline in the output directory

[mpickering]

For example, the cached images should be in a different directory to the converted images.