Implementing Shop catalog
Renamed namespaces