You say you want the question and answer to live under category, great. Then move them to the Category type definition and remove them from the survey definition