Revert "Move everything to root"

This reverts commit 21a2c56c69d396bdde0b979d77a4c6a3a97feed6.