moving files from AppEngine to Common
fixing build