Plugins submodule added. Refactoring done.