reorg in datastores
removed abstract
still reorging
deleted abstract