Structure major rework
Merge branch 'master' of https://github.com/konteck/grider