Massive dependencies refactoring