#7 support for jax-rs annotations, major refactoring