Updated index generation to new directory layout.