add atomic AMIs for F21 beta, and restructure table