move all the models into individual files
clean up old files and move some helpers