Some model updates, still unfinished tho
get rid of old files