improved material shader selection;
moved geometry modules