We are also doing some extra work to prevent data-loss by instead of
removing a folder, doing a rename appending a timestamp