Moved BridgeStorage in its own file.