4096 folder and few index changes