import org.cacert.gigi.email.EmailProvider;
import org.cacert.gigi.output.DateSelector;
import org.cacert.gigi.output.Form;
-import org.cacert.gigi.output.Template;
+import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.Page;
import org.cacert.gigi.util.HTMLEncoder;
import org.cacert.gigi.util.Notary;