innovation: remove module for being confusing, merge submodules into core