Refactored v1 and v2 schema

V2 information were kept in the v1 version of the schema.

This refactoring, while duplicating a bit of information about blocks and analyzer, allows to have a better separation taking into account the limitation of the json schema with regards to "object oriented" definition. The main point being that new properties can't be added to "subdefinitions" when setting "additionalProperties" to false.

This also fixes the problem that v2 analyzers couldn't be validated.