Fixing up imports, etc. in order to move to twoscoops format.