Content structure updates

further content structure updates, no database changes.