Change file structure and interface