refactor commands to sandbox namespace
fix bug