revert to old structure

Now all those things should work much better. Back to the simple editor!