updated index and file structure