Rearranged model level parameters
Updated intermediate file handling