PROBCORE-453 Refactoring, reorganizing Guice Modules.