[refactor] Moving more modules out of the core