Restructuring simulation code base.