dependencies reorganized