Refactoring the MeshGenerator. Committing work to switch branches.