codes restructured