modified file structure and views