remove more old files, and move things around