Files get moved into a single folder now