More consistent arrangement of base templates.