-package ibex.xt;
+package org.ibex.xt;
import java.io.*;
-
import java.net.*;
-import javax.servlet.ServletContext; // FIXME: remove references
-
import java.util.*;
-import ibex.util.*;
-import ibex.js.*;
+import javax.servlet.ServletContext; // FIXME: remove references, use Template.Scope
+
+import org.ibex.util.*;
+import org.ibex.js.*;
import org.prevayler.*;
import org.prevayler.implementation.snapshot.*;