Added .java extension to files so that they will be recognized as such.
Fixed a naming issue.