Continuation of controller reorganisation

- Fixed captcha