Beginning to refactor to use pinject rather than manual dependency injection
Tidying packages