Issue #132
Some refactoring to prepare for handing Galileo nodes connecting to the simulator.