CAPEDWARF-112 Push queue does not retry failed tasks
Refactor dir structure a bit; follow existing pattern