Reformatted "JAR" and added a few more useful classes