Break out classes into simulator.py
Change comments at the top