Factored extra classes out, removed jars, added task 3A