Remove dead code
project.gradle: update dependencies
Move some packages around
Update README