Revert "Move some things"

This reverts commit 06dddd19c64ba0c96762d4e4ff45bf1f73324162.