continued modification of file structure and loading