Reorganize stores folder structure
Minor
Minor: stores restructuring