Updated for ARMS 2A.
Reorganised mockup files.