reorganize storeadapter; bump all the things