Make the directoy layout same as libextra