Change-Id: I9c1ce5f25b21ca81599957a7faa730558d8fc03e
This will make is easier to separate modules and solitaire in the future. We also get rid of the old bridge code. Change-Id: I4d663c36739dfec77cd5d3f1ed6b51f422fe0c91