Restructured run & plot scripts