moving classes around, trying to find a elegant usage of guice injections