[FEATURE] Clean up bin/gateway, refactor cli calls.