Reorganize and improve the AMQ code