Refactor migrations

This PR doesn't change anything, just reorganizes our migrations a bit. Also, a bunch of commits from the development branch got stuck in here somehow. Weird. The only changes were made on May 21st.