Ran Intellj's code cleanup with a brutal configuration + Refactoring

Everything looks a bit better now, but you might want to add a few newlines here and there. I might have broken a few things, but it compiles...

I also refactored jgame -> cubition