Reorganization of dependencies