More organizing of sql/old, hooray!
Merge pull request #9983 from LeGuybrush/organize-

More organizing of sql/old, hooray!