Got multithreaded syncing working.
Some renames and cleanup