working on reorganizing content source so new topics can be added