Begin refactoring indexer
More indexer refactoring
Merge pull request #1 from PHP-Chat/IndexerRefactoring

Indexer refactoring