Fixing MacroExpander, Moving Environment files from SA into Environment, cleaning up some ListStruct analysis code, and added Spring Facet to project level.