fixed indexer back again
refactored indexer into its own package