Revamped project structure
Merge branch 'master' of https://github.com/addi90/Grid