removed empty constructors
moved annotations to new module
Merge pull request #71 from baev/refactoring

refactoring