moved view folder and fixed model attributes