Refactor timeout options

Refactor timeout options to have some sub-fields.