Replaced files to new dir structure