Restructure and extend Terms and Expressions