Code successfully refactored, save for (1) the analysis code and (2) the equilibration code.