Restructure Model + Remove MongoDB driver