file structure fixup