Renaming directories to simplify.