major changes in file structure