Basic enhancement of the grid for overall usage

has some performance improvement
replaced outdated classes
Merge pull request #521 from thatsIch/e-grid-gen

Enhancement: Grid Work