reorganize file names, finish basic index layout