PopQuery,  QueryCalc, & Versions modularized more

Using rectangle and pair classes to simplify the code a bit more. Plus I
made QueryCalculator and abstract class
PopulationQueryTest.java update

Change to file path