Refactored package dependencies