reorganize storeadapter