Big refactoring, part 2: using more natural shape (trajectories, components, grid) for the integrated state