Reorganize support and concern classes
Move queue management into a concern class