Move common template into common dir. Adjust template hierarchy.