Added more datastructure and removed classes from index
resolved conflict