reorganize existing questions