GAR-4 #time 1h #comment Some more refactoring. Material class added.