Revert "repo reorganization"

This reverts commit adf33cc27735f7befade1ce6507524fb1c441b30.