Final tweaks to the starting directories