restructure in preparation to integrate with ndb
restructure in preparation to integrate with ndb