Cleanup

Removing unneeded directories, updating test file, added .java extension
to 3rd grade.