CMS-2384 Templates
Reorganized commands a bit