New layout for index and file structure