some restructuring
Update README.md
map integration \o/