Moved BridgeStorage in its own file (some import failed). Finished FactorMapper.