Move materials so separate class