Reorganized code tree