Rename files for better mapping the directory structructure