Mesh Module and complete Refactoring