Beefed up the Ntentan Data Source and reinforced the reorg of the entire library