refactor presentation, content organization; remove api content