Some changes made according to the design changes.

Added output directory.