Moved classification into its own node in schema

More details to make it easier for third parties to map