1. Added S3 folders for dumpfiles. 2. Sourcefile formatting changes