Some com templates improvments and reordering some models

1 job for master
Status Job ID Name Coverage
  Test
failed #815
test

 
Name Stage Failure
failed
test Test There is an unknown failure, please try again
No job log