YH-220: Moved organization templates to organization extension