Revert "Refactor gateway options to its own class."

This reverts commit 18bfc79f6f1b31d07e61d657cf87f77ccc0dda68.
Refactor gateway options to its own class.
Merge pull request #13 from gmacdougall/gateway-options-refactored

Gateway options refactored