Moved index library refs to local