Lots of files, file structure changed