put files in proper folders and corrected file extensions