Changed so plguins and modules are now maintained separately