added .java where needed