harden and improve exchange/queue

separate out queue declare/binding from exchange mechanism