cleaned up folders, finished test case 14-16, created jar