Continue reorganizing the directory structure.