restructured the data flow builders, removed unnecessary lang dependencies