restructuring app engine code, and more, don't remember