Cleanup
Moved PositionGeneration class into own file