Changed directory structure, fixed app.yaml and uncommented some unneeded server code.