Move thread manager header to proper place
Updates for multithread prep