Update crawlers; slight restructuring.