Add Guice for IoC. Refactor classes and move them to packages