Revert "Make charm/bundle output structure the same"

This reverts commit a716f1e447af68518636a72bcb44c7183757582e.
Change bundle output structure

Change structure depending on whether bundle is being tested directly
or as part of a charm test.