Issues #36 and #42 closed

OOPS is now integrated in the wizard. Also, the old classes have been
removed.