Moved some Guice classes to common package. Additionally, fixed some problems associated with that.