Made forms a module
import fixes; cruft removal