Add new .java classes according to Homework #2