Rework config keys

I am good with the state of the config schema.
This is merged to 2.x. I will release a alpha-verison to test that out.

Currently there is no migration path for the Block-Plugin changes (replaced with another plugin ID)
That will be a follow up on the road to stable.

Automatically closed - issue fixed for 2 weeks with no activity.