Fixing folder and files names that could get to long
Merging