Renamed/moved the options
Removed unused options object class from spec