folder structure fixup.