adjust the content structure
Revert "adjust the content structure"

This reverts commit f10d39eb4d1bd42635cd812c7e17a425e234d385.
Merge remote-tracking branch 'origin/master'