New template and component structure