Organize imports, move Material.java