Added support to move base directories back to original location.