Improved separation of Guice modules between base code and app code