Rename dir to match namespace name (and to match other version modules)

Rename dir to match namespace name (and to match other version modules) #1234