Revert "Simply moved stuff."

This reverts commit ffc810e7308204bb3f0cfc0bf65cfd6ca99b77b1.