Revert "Create abstract class for gateways"

This reverts commit 7015ebf33e707c35ab3c60416395edf420efb7d1.
remove namespace transition