Move things into personal deps and base deps