Revert "More re-org"

This reverts commit 5d98a83d73b07ea61ac46c69412addf8545fb039.