More improvements to rich licence-schema

Rename rich-licence-schema and reinstate orig licence schema
Add organisation schema