Renamed the template files
Ordered the content in odata yaml file