Reorganization: split out utilities; mapping methods