Restructure questions