Continue splitting the weaver

Continue splitting the weaver