Tidy up Voronoi submodules a bit