Merge collect and queue packages

They do the same thing now, and we need access to lower-levels details of
each, depending on our use case. scollector can continue to report its own
details without modification by collect. External programs (like TSAF) now
get a scollector library.