[grid] refactored structure