Chg: Dev: refactor ANM into modules for gh-202