Add MapUtils. Cleanup Points. Add packages.