Reorganized dependencies