restructure of deps