Fix mapping names in README
Add multi platform support
Add some grouping to make the code easier to read