Refactoring for new base plugin
Merge pull request #10 from Answers4AWS/master

Refactoring for new base plugin