Year 2: Questions, questions, questions...

Some general websites, where you can revise question formation (in general):
http://esl.about.com/od/beginnerpronunciation/a/basicquestions.htm
http://esl.about.com/library/quiz/bl_beginnerquestions.htm
http://www.englishclub.com/grammar/verbs-questions.htm
http://www.englisch-hilfen.de/en/exercises/questions/form3.htm
http://www.ego4u.com/en/cram-up/grammar/word-order/questions
http://www.englisch-hilfen.de/en/exercises_list/fragen.htm

More questions with and without auxiliaries:
http://www.englisch-hilfen.de/en/grammar/frage6.htm
http://perso.wanadoo.es/autoenglish/gr.noaux.p.htm