Add missing sections plus reorder the ones that were in a wrong position
Add missing sections plus reorder the ones that were in a wrong position

resource-watch/resource-watch,resource-watch/resource-watch,resource-watch/resource-watch,resource-watch/resource-watch