reorganized files, restructured Algebra/Expression