Fixed some stuff
Split models into a different file