Started refactoring
More refactoring (Poisson sampler still funky)
Fixes to poisson disk sampler