Updated models directory structure