Moved directories, added -guice stuff
Added Guice component
Added heap-guice