Merge pull request #9 from phantomjinx/master

Refactoring of the client plugin - no eclipse!
WIP