Moved some files around

Moved some of the functionality of the build simulator to the run
simulator.