Dependencies reorganized