import org.cacert.gigi.output.Menu;
import org.cacert.gigi.output.MenuItem;
import org.cacert.gigi.output.Outputable;
-import org.cacert.gigi.output.Template;
import org.cacert.gigi.output.Form.CSRFError;
+import org.cacert.gigi.output.template.Template;
import org.cacert.gigi.pages.LoginPage;
import org.cacert.gigi.pages.MainPage;
import org.cacert.gigi.pages.Page;