Cleanup of paths and annotations
Tweaks
Remove comments
Adding guice version
Merge branch 'master' of github.com:stefanlourens/archetypes