Re-organize for GAE
Re-organize for GAE