Refactoring to use guice-modules. Lots of cruft, and not yet working.