Sim_* code into Sim directory