Fixes #2458 - Directory structure precreated