Restructuring OS_Task