About to fix up directory structure.