CS fixes
move captcha elements into subdirectory