Clean-up options parsing
Reorganize bridge code
Fix resetting bridge and containers