table2: added subfolder for plugins
form2: added submodules