Removed messed up submodules
Added back messed up plugins