Update and rename 2-1.java to 2-1and2-2.java