Removing unused class Option.
Renamed newmodels to core; updated all references.