Make mailqueue source work.
Move filecount sink to base.