Changed path for software and file copy
Fixed CCPD merging left into the code by error