Distance modules combined, added to number directory; added 2D geometry directory, mesh stuff promoted