Make initialization and creation use a single directory only.