Refactor into Web/Editorial/API role [not working though]