More reorg. Towards attack actions