refactoring to plugin folder