Change structure and file names