Folder restructure and supermarket complete