OS_Task restructuring