Reset plugin structure
Added new plugin structure
Refactoring