Change the structure to Google App Engine format