Merged the contents of ParameterScan2 into ParameterScan1.
Removed ParameterScan2
Renamed parameterscan