Restructure gateway pattern
Merge pull request #50 from sergeylukin/gateway-pattern-restructure

Restructure gateway pattern