Some com templates improvments and reordering some models

1 job for master