updaing use statements to reflect new hierarchy