Reorganize record controllers
Cleanup record json, which should all go away anyway