move response data templates close to their usage