Refactor on captcha service - moving classes to appropriate package