Align directory names in preparation for adding a bunch of lunix stuff.