Refactor dependencies into common file
Merge pull request #5948 from guardian/refactor-dependencies

Refactor dependencies into common file