Refactored plugins into submodules