Extracting nearly all of the Parallel-specific code to its own files.
Plus general cleanup to try to reduce the lines of code that have changed from the master.