refactor content structure