Restructuring continued (still wip)