add test for doseq; consolidate src dirs