Bundle structuring, removed deprecated metadata-control-form and node models