Merge pull request #15 from jameshomunhoe/master

Moved Class info to new header file
Merged the latest pull request
Changed structure