Split out new indexing code into it's own project