Queue dirs now more closely match api paths