Bug/2801 remove root folder (#2802)