Move service option classes into service namespace

Most KV option classes exist in the root namespace, these should be alongside the KV actions to assist with discoverability.