Moved 'options' classes to the 'options' namespace.