Update 18.02

Update Question Scene
Separate classes