File structure change, index not working
added models