Change-Id: Ie7cbb1a2a72b88e2752065b65d76da9cda9b1c0f
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