placed annotations in seperate files for better readability and easier autoloading
removed some weird $id$ tags in the license comments
Merge pull request #81 from teuneboon/master

placed annotations in seperate files for better readability and easier autoloading