Added new files for multithreading. Prepare to phase out older files