Optimize imports for all TermBuilder related classes in client and shared folder