And back to S3 again; fix issue #10
Moved indexing to separate file