Initial clean up, some reorgs, better control isolation to queue handler