Rearranging directory names, weird git.
Finalise directory renames.