Revert "Move some files around"

This reverts commit 6a47332984fe7915b7a77626bd77b096f27ef97e.