more work on indexer
restructured files