BZ-1094656: avoid `concurrent` loading issues
BZ-1094672: keeps structure after creating new packages... not only the path to root (basically keeps siblings of the path to root)