Adjust all the directory names

Added "s" where appropriate