restructure stores related files