Change output to be compatible with swagger-ui

I tried to keep the output backward compatible. If I broke something, please let me know.