restructure json
Add staging