Some more directory structure changes.