Remove unused import
Reorganize modules
Update guava to 15.0