Rework config-dist to quit new Command structure