Got rid of old plugins, adding submodules instead