Move assistants to submodule