Did some OO refactoring and some convention mapping. Unit test is passing for plugin test task.