Quiz and Question re-organized.