Changed model file structure