Decoupled GridDistribution from Grid.java
Clean up.