File / directory maintenance. (Had to go back and use git mv instead of plain mv.)