reorder and simplify, move old data to *archive files