Refectored classes to match
Merge pull request #71 from andylyall/develop

Refectored classes to match