New sub generators, detach submodule
Small cleanup, more needed