reorganized models directory