Moving to default Guice package