Fix issues with correctly placing preparation directory with passed calls. Avoid unnecessary prefix when creating split output directories