moved generic support classes to separate package
removed unused imports