Mavenized, cleaned up a bit and added uberjar, again