introduced guice; moved into proper packages