Refactor peer-dependencies