restructured gem so there is no more unnecessary options class