Move webstore creation in Catalog script