adapt to new file structure