Replace Grid by interface
Restructuration of hierarchy