Fixed IntelliJ project
Fix build and do some basic cleanup