Rationalization of thread class hierarchy