NameModule, changed module hierarchy