Revert "Moved a few more files"

This reverts commit cea7186011f47f6fc7cfdf6f3bcd07e20813e6f6.
Moved a few more files