Revert "Reorg out one level"

This reverts commit 868264bf093fc2460ead7c29f42fd3c1bfa63ec3.