Captcha Rework
Architecture rework