Changes file structure and naming