reorg complete

Almost everything related to the HSI (except for the text) is now
handled by the NavUtilLib. appears to be functioning correctly