Moved several classes, added basic options framework