Comments
Renaming, part 1
Rename part 2
Merged
Remove obsolete files
Parameterize by number of workers everywhere