replaced consumer with A-MQ classic consumer
Rearrange template hierarchy
Additional template updates