Reorganize and categorize questions