Moved several classes into seperate files
Merge branch 'master' of https://github.com/martinvd/freeman