Reorganize store directory structure