update file names and structure