Updated README
Refactor and grouping