Move more classes over to the Material system vs id system.