Remove guava dependency
Unified module names