Renamed the directory names for consistency with the newer project names