Refactoring. step-maker -> solver, cell-container -> grid