Making dsl output consistent with config structure.

-Trying to remove idea.