changes to import structure to remove star imports