cleanup subgridpy a bit

Reorganize a bit.