Reorganized code dependencies