Removing direct usage of the gateway from the commands package

Signed-off-by: Damien Le Berrigaud <damien@pivotallabs.com>