Incorporated Guice, and drastically overhauled modular organization.