Directory naming clean-up in preparation for big rewrite. ;-)