converted non-appengine branch to standard structure