fixing models
new strucutre for production