a bit more reorg

We only want one file for init. After that everything is going to be
logical based on file name.