Update and rename Material.java to Substance.java