Merge "Improved how the Shell directories are created."