Yes, I was meaning rearranging them at least by object inside each action type (get, create, etc). This will probably cause a lot of pain in terms of merge conflicts, so we can leave it for now