move content to new structure