changing two plugins to submodules