Small refactor on the CLI, starting a Quadtree based implementation