diff --git a/examples/conftest.py b/examples/conftest.py
deleted file mode 100644
index 273b1c4a6bd099f96831d406678c910fc9371722..0000000000000000000000000000000000000000
--- a/examples/conftest.py
+++ /dev/null
@@ -1,7 +0,0 @@
-# This file tells py.test to scan for test_xxx() functions in
-# any file below here, not just those named test_xxxx.py.
-
-
-def pytest_collect_file(path, parent):
-    if "grudge/examples" in str(path.dirpath()) and path.ext == ".py":
-        return parent.Module(path, parent=parent)
diff --git a/examples/wave/var-propagation-speed.py b/examples/wave/var-propagation-speed.py
index f161d0346c1349e508b5ed5a32737e1cccf61312..a7a634f7a8b79f3006525059e70cc4379581127c 100644
--- a/examples/wave/var-propagation-speed.py
+++ b/examples/wave/var-propagation-speed.py
@@ -35,7 +35,7 @@ def main(write_output=True, order=4):
     cl_ctx = cl.create_some_context()
     queue = cl.CommandQueue(cl_ctx)
 
-    dims = 3
+    dims = 2
     from meshmode.mesh.generation import generate_regular_rect_mesh
     mesh = generate_regular_rect_mesh(
             a=(-0.5,)*dims,
@@ -90,7 +90,7 @@ def main(write_output=True, order=4):
 
     dt_stepper = set_up_rk4("w", dt, fields, rhs)
 
-    final_t = 10
+    final_t = 1
     nsteps = int(final_t/dt)
     print("dt=%g nsteps=%d" % (dt, nsteps))
 
@@ -113,7 +113,7 @@ def main(write_output=True, order=4):
             print(step, event.t, norm(queue, u=event.state_component[0]),
                     time()-t_last_step)
             if step % 10 == 0:
-                vis.write_vtk_file("fld-%04d.vtu" % step,
+                vis.write_vtk_file("fld-var-propogation-speed-%04d.vtu" % step,
                         [
                             ("u", event.state_component[0]),
                             ("v", event.state_component[1:]),
diff --git a/examples/wave/wave-min.py b/examples/wave/wave-min.py
index d7ebffd33a7732c621d159622804fed064f365b3..d793e3a09716b883d91c90f1fddfb2f96bacf1a2 100644
--- a/examples/wave/wave-min.py
+++ b/examples/wave/wave-min.py
@@ -113,7 +113,7 @@ def main(write_output=True, order=4):
             print(step, event.t, norm(queue, u=event.state_component[0]),
                     time()-t_last_step)
             if step % 10 == 0:
-                vis.write_vtk_file("fld-%04d.vtu" % step,
+                vis.write_vtk_file("fld-wave-min-%04d.vtu" % step,
                         [
                             ("u", event.state_component[0]),
                             ("v", event.state_component[1:]),
diff --git a/examples/advection/advection.py b/unported-examples/advection/advection.py
similarity index 100%
rename from examples/advection/advection.py
rename to unported-examples/advection/advection.py
diff --git a/examples/advection/var-velocity.py b/unported-examples/advection/var-velocity.py
similarity index 100%
rename from examples/advection/var-velocity.py
rename to unported-examples/advection/var-velocity.py
diff --git a/examples/advection/weak.py b/unported-examples/advection/weak.py
similarity index 100%
rename from examples/advection/weak.py
rename to unported-examples/advection/weak.py
diff --git a/examples/benchmark_grudge/benchmark_mpi.py b/unported-examples/benchmark_grudge/benchmark_mpi.py
similarity index 100%
rename from examples/benchmark_grudge/benchmark_mpi.py
rename to unported-examples/benchmark_grudge/benchmark_mpi.py
diff --git a/examples/benchmark_grudge/run_benchmark.sh b/unported-examples/benchmark_grudge/run_benchmark.sh
similarity index 100%
rename from examples/benchmark_grudge/run_benchmark.sh
rename to unported-examples/benchmark_grudge/run_benchmark.sh
diff --git a/examples/burgers/burgers.py b/unported-examples/burgers/burgers.py
similarity index 100%
rename from examples/burgers/burgers.py
rename to unported-examples/burgers/burgers.py
diff --git a/examples/gas_dynamics/box-in-box.py b/unported-examples/gas_dynamics/box-in-box.py
similarity index 100%
rename from examples/gas_dynamics/box-in-box.py
rename to unported-examples/gas_dynamics/box-in-box.py
diff --git a/examples/gas_dynamics/euler/sine-wave.py b/unported-examples/gas_dynamics/euler/sine-wave.py
similarity index 100%
rename from examples/gas_dynamics/euler/sine-wave.py
rename to unported-examples/gas_dynamics/euler/sine-wave.py
diff --git a/examples/gas_dynamics/euler/sod-2d.py b/unported-examples/gas_dynamics/euler/sod-2d.py
similarity index 100%
rename from examples/gas_dynamics/euler/sod-2d.py
rename to unported-examples/gas_dynamics/euler/sod-2d.py
diff --git a/examples/gas_dynamics/euler/vortex-adaptive-grid.py b/unported-examples/gas_dynamics/euler/vortex-adaptive-grid.py
similarity index 100%
rename from examples/gas_dynamics/euler/vortex-adaptive-grid.py
rename to unported-examples/gas_dynamics/euler/vortex-adaptive-grid.py
diff --git a/examples/gas_dynamics/euler/vortex-sources.py b/unported-examples/gas_dynamics/euler/vortex-sources.py
similarity index 100%
rename from examples/gas_dynamics/euler/vortex-sources.py
rename to unported-examples/gas_dynamics/euler/vortex-sources.py
diff --git a/examples/gas_dynamics/euler/vortex.py b/unported-examples/gas_dynamics/euler/vortex.py
similarity index 100%
rename from examples/gas_dynamics/euler/vortex.py
rename to unported-examples/gas_dynamics/euler/vortex.py
diff --git a/examples/gas_dynamics/gas_dynamics_initials.py b/unported-examples/gas_dynamics/gas_dynamics_initials.py
similarity index 100%
rename from examples/gas_dynamics/gas_dynamics_initials.py
rename to unported-examples/gas_dynamics/gas_dynamics_initials.py
diff --git a/examples/gas_dynamics/lbm-simple.py b/unported-examples/gas_dynamics/lbm-simple.py
similarity index 100%
rename from examples/gas_dynamics/lbm-simple.py
rename to unported-examples/gas_dynamics/lbm-simple.py
diff --git a/examples/gas_dynamics/naca.py b/unported-examples/gas_dynamics/naca.py
similarity index 100%
rename from examples/gas_dynamics/naca.py
rename to unported-examples/gas_dynamics/naca.py
diff --git a/examples/gas_dynamics/navierstokes/shearflow.py b/unported-examples/gas_dynamics/navierstokes/shearflow.py
similarity index 100%
rename from examples/gas_dynamics/navierstokes/shearflow.py
rename to unported-examples/gas_dynamics/navierstokes/shearflow.py
diff --git a/examples/gas_dynamics/square.py b/unported-examples/gas_dynamics/square.py
similarity index 100%
rename from examples/gas_dynamics/square.py
rename to unported-examples/gas_dynamics/square.py
diff --git a/examples/gas_dynamics/wing.py b/unported-examples/gas_dynamics/wing.py
similarity index 100%
rename from examples/gas_dynamics/wing.py
rename to unported-examples/gas_dynamics/wing.py
diff --git a/examples/geometry.py b/unported-examples/geometry.py
similarity index 100%
rename from examples/geometry.py
rename to unported-examples/geometry.py
diff --git a/examples/heat/heat.py b/unported-examples/heat/heat.py
similarity index 100%
rename from examples/heat/heat.py
rename to unported-examples/heat/heat.py
diff --git a/examples/maxwell/.gitignore b/unported-examples/maxwell/.gitignore
similarity index 100%
rename from examples/maxwell/.gitignore
rename to unported-examples/maxwell/.gitignore
diff --git a/examples/maxwell/cavities.py b/unported-examples/maxwell/cavities.py
similarity index 100%
rename from examples/maxwell/cavities.py
rename to unported-examples/maxwell/cavities.py
diff --git a/examples/maxwell/dipole.py b/unported-examples/maxwell/dipole.py
similarity index 100%
rename from examples/maxwell/dipole.py
rename to unported-examples/maxwell/dipole.py
diff --git a/examples/maxwell/generate-bessel-zeros.py b/unported-examples/maxwell/generate-bessel-zeros.py
similarity index 100%
rename from examples/maxwell/generate-bessel-zeros.py
rename to unported-examples/maxwell/generate-bessel-zeros.py
diff --git a/examples/maxwell/inhom-cavity.py b/unported-examples/maxwell/inhom-cavity.py
similarity index 100%
rename from examples/maxwell/inhom-cavity.py
rename to unported-examples/maxwell/inhom-cavity.py
diff --git a/examples/maxwell/inhomogeneous_waveguide.mac b/unported-examples/maxwell/inhomogeneous_waveguide.mac
similarity index 100%
rename from examples/maxwell/inhomogeneous_waveguide.mac
rename to unported-examples/maxwell/inhomogeneous_waveguide.mac
diff --git a/examples/maxwell/maxwell-2d.py b/unported-examples/maxwell/maxwell-2d.py
similarity index 100%
rename from examples/maxwell/maxwell-2d.py
rename to unported-examples/maxwell/maxwell-2d.py
diff --git a/examples/maxwell/maxwell-pml.py b/unported-examples/maxwell/maxwell-pml.py
similarity index 100%
rename from examples/maxwell/maxwell-pml.py
rename to unported-examples/maxwell/maxwell-pml.py
diff --git a/examples/maxwell/notes.tm b/unported-examples/maxwell/notes.tm
similarity index 100%
rename from examples/maxwell/notes.tm
rename to unported-examples/maxwell/notes.tm
diff --git a/examples/poisson/helmholtz.py b/unported-examples/poisson/helmholtz.py
similarity index 100%
rename from examples/poisson/helmholtz.py
rename to unported-examples/poisson/helmholtz.py
diff --git a/examples/poisson/poisson.py b/unported-examples/poisson/poisson.py
similarity index 100%
rename from examples/poisson/poisson.py
rename to unported-examples/poisson/poisson.py