Restructured a package and added an option to enable/disable recaptcha.