fixing busted use statements due to restructuring