Move shops to their own package.