Update and rename files.java to shapes.java