Update and rename Canvas to Canvas.java