Cleaning up file structure for templates and views