Moved the shop package under the model package