new package for indexers, rename files, code clean up