1st attempt at reorganizing deps (XD-903 prelim)