The recent code structure change almost certainly broke a lot of things relating to docker.

[cc-d]

That said, it had to be done. The structure we had was getting really unwieldy.