Moved threads into a single file