Little restructure

To follow the `action:subject` paradigm