Refactoring BinDeps stuff