Simulation Demo project fix and refactoring.