reorganized models folder