Renamed namespace & subdir to "valid"