moved guice specific code into own package