cleanup of files and reorganisation