Incorporate code from old limesurvey classes into newer classes

[rvm-peercode]

Done by first moving the code from the newer class into the older class, and then renaming and moving the old class to the new name. This way, the least amount of code had to be moved around.