move update_particles and most of update_particles_i into Simulation.cpp. Also a lot of other reformatting