Changed models directory structure