-main added, project formatted to generate uberjar, cleanup in srcs