better org for task queues