IntelliJ IDEA project structure
Make the whole project compile
Apply recommended code fixes

Based on code inspection by IntelliJ IDEA.