Brandon/Shannon: Datastore reorganization step 1.