Small changes to codebase.

Added ability to generate output folder