more cleanup (WIP)
registered submodules (WIP)