Rename main table, add second for archive

Big changes.