Reorganized model folder