Restructure models into their own directory