Output directory update

Now using Macros to determine the destination of the output file.