More organizing of sql/old, hooray!

Continuation of previous organization.