Revert "Indexer refactor" due to duplicated files

This reverts commit e121373a604d6241462672ddfa9df062afb593e1.