Move things and modify to allow proper building

and running of simulations.