Queue renaming reversal part 3: move module into place and
change imports and other references. Closes #2925.
15 files changed