Move questions to SQL file and reorganize