some re-org of content