more renamings (reorganizeMain)
...