refactor import grid system