Depreciated the old macros.tex
Rigged for references and to use new macros file.