Updated index to have more structure and space