Moving the folders to the correct names
Renaming the files to be corect