Moved some classes to a more logical place
Merge branch 'master' of https://github.com/Sicos1977/msgreader.git