REFACTOR cleaning up dime-commons; move solely gateway-related to dime-gateway