Fixed Question object
Moved objects from individual files into an objects file.