state/policy: move package, update mentions