diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 0000000..0baf809
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1 @@
+*.min.js
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 0000000..174dd28
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,57 @@
+{
+  "env": {
+    "amd": true,
+    "browser": true,
+    "jasmine": true
+  },
+  "rules": {
+    "consistent-return": 2,
+    "eqeqeq": [2, "smart"],
+    "guard-for-in": 2,
+    "lines-around-comment": [
+      2,
+      {
+        "beforeBlockComment": true
+      }
+    ],
+    "max-len": [2, 120, 4],
+    "max-nested-callbacks": [2, 3],
+    "no-alert": 2,
+    "no-array-constructor": 2,
+    "no-caller": 2,
+    "no-catch-shadow": 2,
+    "no-else-return": 2,
+    "no-eval": 2,
+    "no-extend-native": 2,
+    "no-extra-bind": 2,
+    "no-floating-decimal": 2,
+    "no-implied-eval": 2,
+    "no-lone-blocks": 2,
+    "no-lonely-if": 2,
+    "no-loop-func": 2,
+    "no-multi-str": 2,
+    "no-new-object": 2,
+    "no-proto": 2,
+    "no-return-assign": 2,
+    "no-self-compare": 2,
+    "no-shadow": 2,
+    "no-undef-init": 2,
+    "no-unused-vars": [
+      2,
+      {
+        "args": "after-used",
+        "vars": "all",
+        "varsIgnorePattern": "^config$"
+      }
+    ],
+    "no-with": 2,
+    "operator-assignment": [2, "always"],
+    "radix": 2,
+    "semi": [2, "always"],
+    "semi-spacing": 2,
+    "space-before-blocks": "error",
+    "space-before-function-paren":"error",
+    "func-style": [2, "expression"],
+    "eol-last":"error"
+  }
+}
\ No newline at end of file
diff --git a/Iazel/RegenProductUrl/Console/Command/RegenerateCategoryPathCommand.php b/Iazel/RegenProductUrl/Console/Command/RegenerateCategoryPathCommand.php
deleted file mode 100644
index c4c5d4d..0000000
--- a/Iazel/RegenProductUrl/Console/Command/RegenerateCategoryPathCommand.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<?php
-namespace Iazel\RegenProductUrl\Console\Command;
-
-use Magento\Catalog\Model\ResourceModel\Category as CategoryResource;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\ResourceConnection;
-use Magento\Framework\EntityManager\EventManager;
-use Magento\Store\Model\App\Emulation;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
-use Magento\Store\Model\Store;
-use Magento\Framework\App\State;
-
-class RegenerateCategoryPathCommand extends Command
-{
-    /**
-     * @var CategoryUrlPathGenerator\Proxy
-     */
-    protected $categoryUrlPathGenerator;
-
-    /**
-     * @var UrlPersistInterface\Proxy
-     */
-    protected $urlPersist;
-
-    /**
-     * @var CategoryRepositoryInterface\Proxy
-     */
-    protected $collection;
-
-    /**
-     * @var \Magento\Framework\App\State
-     */
-    protected $state;
-
-    /**
-     * @var CategoryCollectionFactory\Proxy
-     */
-    private $categoryCollectionFactory;
-    /**
-     * @var EventManager\Proxy
-     */
-    private $eventManager;
-    /**
-     * @var CategoryResource\Proxy
-     */
-    private $categoryResource;
-    /**
-     * @var Emulation\Proxy
-     */
-    private $emulation;
-
-    /**
-     * RegenerateCategoryPathCommand constructor.
-     * @param State $state
-     * @param CategoryCollectionFactory\Proxy $categoryCollectionFactory
-     * @param CategoryUrlPathGenerator\Proxy $categoryUrlPathGenerator
-     * @param UrlPersistInterface\Proxy $urlPersist
-     * @param EventManager\Proxy $eventManager
-     * @param CategoryResource\Proxy $categoryResource
-     * @param ResourceConnection\Proxy $resource
-     * @param Emulation\Proxy $emulation
-     */
-    public function __construct(
-        State $state,
-        CategoryCollectionFactory\Proxy $categoryCollectionFactory,
-        CategoryUrlPathGenerator\Proxy $categoryUrlPathGenerator,
-        UrlPersistInterface\Proxy $urlPersist,
-        EventManager\Proxy $eventManager,
-        CategoryResource\Proxy $categoryResource,
-        Emulation\Proxy $emulation
-    ) {
-        $this->state = $state;
-        $this->categoryUrlPathGenerator = $categoryUrlPathGenerator;
-        $this->urlPersist = $urlPersist;
-        parent::__construct();
-        $this->categoryCollectionFactory = $categoryCollectionFactory;
-        $this->eventManager = $eventManager;
-        $this->categoryResource = $categoryResource;
-        $this->emulation = $emulation;
-    }
-
-    protected function configure()
-    {
-        $this->setName('regenerate:category:path')
-            ->setDescription('Regenerate path for given categories')
-            ->addArgument(
-                'cids',
-                InputArgument::IS_ARRAY,
-                'Categories to regenerate'
-            )
-            ->addOption(
-                'store', 's',
-                InputOption::VALUE_REQUIRED,
-                'Use the specific Store View',
-                Store::DEFAULT_STORE_ID
-            )
-        ;
-        return parent::configure();
-    }
-
-    public function execute(InputInterface $inp, OutputInterface $out)
-    {
-        try{
-            $this->state->getAreaCode();
-        }catch ( \Magento\Framework\Exception\LocalizedException $e){
-            $this->state->setAreaCode('adminhtml');
-        }
-
-        $store_id = $inp->getOption('store');
-
-        $categories = $this->categoryCollectionFactory->create()
-            ->setStore($store_id)
-            ->addAttributeToSelect(['name', 'url_path', 'url_key']);
-
-        $cids = $inp->getArgument('cids');
-        if( !empty($cids) ) {
-            $categories->addAttributeToFilter('entity_id', ['in' => $cids]);
-        }
-
-        $regenerated = 0;
-        foreach($categories as $category)
-        {
-            $out->writeln('Regenerating urls for ' . $category->getName() . ' (' . $category->getId() . ')');
-
-            $category->setOrigData('url_key', mt_rand(1,1000)); // set url_key in orig data to random value to force regeneration of path
-            $category->setOrigData('url_path', mt_rand(1,1000)); // set url_path in orig data to random value to force regeneration of path for children
-
-            // Make use of Magento's event for this
-            $this->emulation->startEnvironmentEmulation($store_id, Area::AREA_FRONTEND, true);
-            $this->eventManager->dispatch('regenerate_category_url_path', ['category' => $category]);
-            $this->emulation->stopEnvironmentEmulation();
-
-            $regenerated++;
-        }
-
-        $out->writeln('Done regenerating. Regenerated url paths for ' . $regenerated . ' categories');
-    }
-}
diff --git a/Iazel/RegenProductUrl/Console/Command/RegenerateCategoryUrlCommand.php b/Iazel/RegenProductUrl/Console/Command/RegenerateCategoryUrlCommand.php
deleted file mode 100644
index 72dd260..0000000
--- a/Iazel/RegenProductUrl/Console/Command/RegenerateCategoryUrlCommand.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-namespace Iazel\RegenProductUrl\Console\Command;
-
-use Magento\Framework\App\Area;
-use Magento\Store\Model\App\Emulation;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
-use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
-use Magento\Catalog\Model\ResourceModel\Category\Collection;
-use Magento\Store\Model\Store;
-use Magento\Framework\App\State;
-
-class RegenerateCategoryUrlCommand extends Command
-{
-    /**
-     * @var CategoryUrlRewriteGenerator\Proxy
-     */
-    protected $categoryUrlRewriteGenerator;
-
-    /**
-     * @var UrlPersistInterface\Proxy
-     */
-    protected $urlPersist;
-
-    /**
-     * @var CategoryRepositoryInterface\Proxy
-     */
-    protected $collection;
-
-    /**
-     * @var \Magento\Framework\App\State
-     */
-    protected $state;
-    
-    /**
-     * @var CategoryCollectionFactory\Proxy
-     */
-    private $categoryCollectionFactory;
-    
-    /**
-     * @var Emulation\Proxy
-     */
-    private $emulation;
-
-    /**
-     * RegenerateCategoryUrlCommand constructor.
-     * @param State $state
-     * @param Collection\Proxy $collection
-     * @param CategoryUrlRewriteGenerator\Proxy $categoryUrlRewriteGenerator
-     * @param UrlPersistInterface\Proxy $urlPersist
-     * @param CategoryCollectionFactory\Proxy $categoryCollectionFactory
-     * @param Emulation\Proxy $emulation
-     */
-    public function __construct(
-        State $state,
-        Collection\Proxy $collection,
-        CategoryUrlRewriteGenerator\Proxy $categoryUrlRewriteGenerator,
-        UrlPersistInterface\Proxy $urlPersist,
-        CategoryCollectionFactory\Proxy $categoryCollectionFactory,
-        Emulation\Proxy $emulation
-    ) {
-        $this->state = $state;
-        $this->collection = $collection;
-        $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
-        $this->urlPersist = $urlPersist;
-        $this->categoryCollectionFactory = $categoryCollectionFactory;
-
-        parent::__construct();
-        $this->emulation = $emulation;
-    }
-
-    protected function configure()
-    {
-        $this->setName('regenerate:category:url')
-            ->setDescription('Regenerate url for given categories')
-            ->addArgument(
-                'cids',
-                InputArgument::IS_ARRAY,
-                'Categories to regenerate'
-            )
-            ->addOption(
-                'store', 's',
-                InputOption::VALUE_REQUIRED,
-                'Use the specific Store View',
-                Store::DEFAULT_STORE_ID
-            )
-        ;
-        return parent::configure();
-    }
-
-    public function execute(InputInterface $inp, OutputInterface $out)
-    {
-        try{
-            $this->state->getAreaCode();
-        }catch ( \Magento\Framework\Exception\LocalizedException $e){
-            $this->state->setAreaCode('adminhtml');
-        }
-
-        $store_id = $inp->getOption('store');
-        $this->emulation->startEnvironmentEmulation($store_id, Area::AREA_FRONTEND, true);
-
-        $categories = $this->categoryCollectionFactory->create()
-            ->setStore($store_id)
-            ->addAttributeToSelect(['name', 'url_path', 'url_key']);
-
-        $cids = $inp->getArgument('cids');
-        if( !empty($cids) ) {
-            $categories->addAttributeToFilter('entity_id', ['in' => $cids]);
-        }
-
-        $regenerated = 0;
-        foreach($categories as $category)
-        {
-            $out->writeln('Regenerating urls for ' . $category->getName() . ' (' . $category->getId() . ')');
-
-            $this->urlPersist->deleteByData([
-                UrlRewrite::ENTITY_ID => $category->getId(),
-                UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
-                UrlRewrite::REDIRECT_TYPE => 0,
-                UrlRewrite::STORE_ID => $store_id
-            ]);
-
-            $newUrls = $this->categoryUrlRewriteGenerator->generate($category);
-            try {
-                $newUrls = $this->filterEmptyRequestPaths($newUrls);
-                $this->urlPersist->replace($newUrls);
-                $regenerated += count($newUrls);
-            }
-            catch(\Exception $e) {
-                $out->writeln(sprintf('<error>Duplicated url for store ID %d, category %d (%s) - %s Generated URLs:' . PHP_EOL . '%s</error>' . PHP_EOL, $store_id, $category->getId(), $category->getName(), $e->getMessage(), implode(PHP_EOL, array_keys($newUrls))));
-            }
-        }
-        $this->emulation->stopEnvironmentEmulation();
-        $out->writeln('Done regenerating. Regenerated ' . $regenerated . ' urls');
-    }
-    
-    /**
-     * Remove entries with request_path='' to prevent error 404 for "http://site.com/" address.
-     *
-     * @param \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[] $newUrls
-     * @return \Magento\UrlRewrite\Service\V1\Data\UrlRewrite[]
-     */
-    private function filterEmptyRequestPaths($newUrls)
-    {
-        $result = [];
-        foreach ($newUrls as $key => $url) {
-            $requestPath = $url->getRequestPath();
-            if (!empty($requestPath)) {
-                $result[$key] = $url;
-            }
-        }
-        return $result;
-    }    
-}
diff --git a/Iazel/RegenProductUrl/Console/Command/RegenerateCmsPageUrlCommand.php b/Iazel/RegenProductUrl/Console/Command/RegenerateCmsPageUrlCommand.php
deleted file mode 100644
index 67806e0..0000000
--- a/Iazel/RegenProductUrl/Console/Command/RegenerateCmsPageUrlCommand.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-
-
-namespace Iazel\RegenProductUrl\Console\Command;
-
-
-use Magento\Cms\Model\Page;
-use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
-use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
-use Magento\Framework\App\Area;
-use Magento\Framework\App\State;
-use Magento\Framework\Console\Cli;
-use Magento\Store\Model\App\Emulation;
-use Magento\Store\Model\Store;
-use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Output\OutputInterface;
-
-class RegenerateCmsPageUrlCommand extends Command
-{
-    /**
-     * @var State
-     */
-    private $state;
-
-    /**
-     * @var Emulation\Proxy
-     */
-    private $emulation;
-
-    /**
-     * @var PageCollectionFactory
-     */
-    private $pageCollectionFactory;
-
-    /**
-     * @var UrlPersistInterface
-     */
-    private $urlPersist;
-
-    /**
-     * @var CmsPageUrlRewriteGenerator
-     */
-    private $cmsPageUrlRewriteGenerator;
-
-    /**
-     * RegenerateCmsPageUrlCommand constructor.
-     *
-     * @param State $state
-     * @param Emulation $emulation
-     * @param PageCollectionFactory $pageCollectionFactory
-     * @param UrlPersistInterface $urlPersist
-     * @param CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator
-     */
-    public function __construct(
-        State $state,
-        Emulation $emulation,
-        PageCollectionFactory $pageCollectionFactory,
-        UrlPersistInterface $urlPersist,
-        CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator
-    ) {
-        parent::__construct();
-        $this->state = $state;
-        $this->emulation = $emulation;
-        $this->pageCollectionFactory = $pageCollectionFactory;
-        $this->urlPersist = $urlPersist;
-        $this->cmsPageUrlRewriteGenerator = $cmsPageUrlRewriteGenerator;
-    }
-
-    protected function configure()
-    {
-        $this->setName('regenerate:cms-page:url')
-            ->setDescription('Regenerate url for cms pages.')
-            ->addArgument(
-                'pids',
-                InputArgument::IS_ARRAY,
-                'CMS Pages to regenerate'
-            )
-            ->addOption(
-                'store',
-                's',
-                InputOption::VALUE_OPTIONAL,
-                'Regenerate for one specific store view',
-                Store::DEFAULT_STORE_ID
-            )->addOption(
-                'all-stores',
-                'a',
-                InputOption::VALUE_OPTIONAL,
-                'Regenerate for all stores.',
-                false
-            );
-    }
-
-    /**
-     * @param InputInterface $input
-     * @param OutputInterface $output
-     *
-     * @return int|void|null
-     * @throws \Magento\Framework\Exception\LocalizedException
-     */
-    protected function execute(InputInterface $input, OutputInterface $output)
-    {
-        $output->writeln('<info>Start regenerating urls for CMS pages.</info>');
-        try {
-            $this->state->getAreaCode();
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->state->setAreaCode(Area::AREA_ADMINHTML);
-        }
-
-        $storeId = $input->getOption('store');
-        $this->emulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
-
-        $pages = $this->pageCollectionFactory->create();
-
-        if (!$input->getOption('all-stores') !== false) {
-            $pages->addStoreFilter($storeId);
-        }
-
-        if (count($input->getArgument('pids')) > 0) {
-            $pageIds = $input->getArgument('pids');
-            $pages->addFieldToFilter('page_id', ['in' => $pageIds]);
-        }
-
-        $regenerated = 0;
-        /** @var Page $page */
-        foreach ($pages as $page) {
-            $newUrls = $this->cmsPageUrlRewriteGenerator->generate($page);
-            try {
-                $this->urlPersist->replace($newUrls);
-                $regenerated += count($newUrls);
-            } catch (UrlAlreadyExistsException $e) {
-                $output->writeln(sprintf('<error>Url for page %s (%d) already exists.' . PHP_EOL . '%s</error>',
-                    $page->getTitle(), $page->getId(), $e->getMessage()));
-            } catch (\Exception $e) {
-                $output->writeln(sprintf('<error>Couldn\'t replace url for %s (%d)' . PHP_EOL . '%s</error>'));
-            }
-        }
-
-        $this->emulation->stopEnvironmentEmulation();
-        $output->writeln(sprintf('<info>Finished regenerating. Regenerated %d urls.</info>', $regenerated));
-        return Cli::RETURN_SUCCESS;
-    }
-}
\ No newline at end of file
diff --git a/Iazel/RegenProductUrl/Console/Command/RegenerateProductUrlCommand.php b/Iazel/RegenProductUrl/Console/Command/RegenerateProductUrlCommand.php
deleted file mode 100644
index a340c3a..0000000
--- a/Iazel/RegenProductUrl/Console/Command/RegenerateProductUrlCommand.php
+++ /dev/null
@@ -1,160 +0,0 @@
-<?php
-namespace Iazel\RegenProductUrl\Console\Command;
-
-use Magento\Catalog\Model\Product\Visibility;
-use Magento\Store\Model\StoreManagerInterface;
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputOption;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
-use Magento\UrlRewrite\Model\UrlPersistInterface;
-use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
-use Magento\Catalog\Model\ResourceModel\Product\Collection;
-use Magento\Store\Model\Store;
-use Magento\Framework\App\State;
-
-class RegenerateProductUrlCommand extends Command
-{
-    /**
-     * @var ProductUrlRewriteGenerator\Proxy
-     */
-    protected $productUrlRewriteGenerator;
-
-    /**
-     * @var UrlPersistInterface\Proxy
-     */
-    protected $urlPersist;
-
-    /**
-     * @var Collection\Proxy
-     */
-    protected $collection;
-
-    /**
-     * @var \Magento\Framework\App\State
-     */
-    protected $state;
-    
-    /**
-     * @var StoreManagerInterface\Proxy
-     */
-    private $storeManager;
-
-    /**
-     * RegenerateProductUrlCommand constructor.
-     * @param State $state
-     * @param Collection\Proxy $collection
-     * @param ProductUrlRewriteGenerator\Proxy $productUrlRewriteGenerator
-     * @param UrlPersistInterface\Proxy $urlPersist
-     * @param StoreManagerInterface\Proxy $storeManager
-     */
-    public function __construct(
-        State $state,
-        Collection\Proxy $collection,
-        ProductUrlRewriteGenerator\Proxy $productUrlRewriteGenerator,
-        UrlPersistInterface\Proxy $urlPersist,
-        StoreManagerInterface\Proxy $storeManager
-    ) {
-        $this->state = $state;
-        $this->collection = $collection;
-        $this->productUrlRewriteGenerator = $productUrlRewriteGenerator;
-        $this->urlPersist = $urlPersist;
-        parent::__construct();
-        $this->storeManager = $storeManager;
-    }
-
-    protected function configure()
-    {
-        $this->setName('regenerate:product:url')
-            ->setDescription('Regenerate url for given products')
-            ->addOption(
-                'store', 's',
-                InputOption::VALUE_REQUIRED,
-                'Regenerate for one specific store view',
-                Store::DEFAULT_STORE_ID
-            )
-            ->addArgument(
-                'pids',
-                InputArgument::IS_ARRAY,
-                'Product IDs to regenerate'
-            );
-    }
-
-    public function execute(InputInterface $input, OutputInterface $output)
-    {
-        try {
-            $this->state->getAreaCode();
-        } catch (\Magento\Framework\Exception\LocalizedException $e) {
-            $this->state->setAreaCode('adminhtml');
-        }
-
-        $storeId = $input->getOption('store');
-        $stores = $this->storeManager->getStores(false);
-
-        if (!is_numeric($storeId)) {
-            $storeId = $this->getStoreIdByCode($storeId, $stores);
-        }
-
-        if (!is_numeric($storeId)) {
-            throw new \Exception('Store could not be found. Please enter a store ID or a store code.');
-        } else {
-            $this->storeManager->getStore($storeId);
-        }
-
-        foreach ($stores as $store) {
-            // If store has been given through option, skip other stores
-            if ($storeId != Store::DEFAULT_STORE_ID AND $store->getId() != $storeId) {
-                continue;
-            }
-
-            $this->collection
-                ->addStoreFilter($store->getId())
-                ->setStoreId($store->getId())
-                ->addFieldToFilter('visibility', ['gt' => Visibility::VISIBILITY_NOT_VISIBLE]);
-
-            $pids = $input->getArgument('pids');
-            if (!empty($pids)) {
-                $this->collection->addIdFilter($pids);
-            }
-
-            $this->collection->addAttributeToSelect(['url_path', 'url_key']);
-            $list = $this->collection->load();
-            $regenerated = 0;
-
-            /** @var \Magento\Catalog\Model\Product $product */
-            foreach ($list as $product) {
-                echo 'Regenerating urls for ' . $product->getSku() . ' (' . $product->getId() . ') in store ' . $store->getName() . PHP_EOL;
-                $product->setStoreId($store->getId());
-
-                $this->urlPersist->deleteByData([
-                    UrlRewrite::ENTITY_ID => $product->getId(),
-                    UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
-                    UrlRewrite::REDIRECT_TYPE => 0,
-                    UrlRewrite::STORE_ID => $store->getId()
-                ]);
-
-                $newUrls = $this->productUrlRewriteGenerator->generate($product);
-                try {
-                    $this->urlPersist->replace($newUrls);
-                    $regenerated += count($newUrls);
-                } catch (\Exception $e) {
-                    $output->writeln(sprintf('<error>Duplicated url for store ID %d, product %d (%s) - %s Generated URLs:' . PHP_EOL . '%s</error>' . PHP_EOL, $store->getId(), $product->getId(), $product->getSku(), $e->getMessage(), implode(PHP_EOL, array_keys($newUrls))));
-                }
-            }
-            $output->writeln('Done regenerating. Regenerated ' . $regenerated . ' urls for store ' . $store->getName());
-        }
-    }
-
-    private function getStoreIdByCode($store_id, $stores)
-    {
-        foreach ($stores as $store) {
-            if ($store->getCode() == $store_id) {
-                return $store->getId();
-            }
-        }
-
-        return false;
-    }
-}
diff --git a/Iazel/RegenProductUrl/Model/CategoryUrlPathGenerator.php b/Iazel/RegenProductUrl/Model/CategoryUrlPathGenerator.php
deleted file mode 100644
index 93a0899..0000000
--- a/Iazel/RegenProductUrl/Model/CategoryUrlPathGenerator.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-namespace Iazel\RegenProductUrl\Model;
-
-class CategoryUrlPathGenerator extends \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
-{
-
-    /**
-     * @param \Magento\Catalog\Model\Category $category
-     * @return bool
-     */
-    protected function isNeedToGenerateUrlPathForParent($category)
-    {
-        /* Force true when command is run from the CLI */
-        if (PHP_SAPI == 'cli') {
-            return true;
-        }
-
-        return $category->isObjectNew() || $category->getLevel() >= self::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING;
-    }
-}
\ No newline at end of file
diff --git a/Iazel/RegenProductUrl/etc/di.xml b/Iazel/RegenProductUrl/etc/di.xml
deleted file mode 100644
index 81c45e9..0000000
--- a/Iazel/RegenProductUrl/etc/di.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © 2016 Magento. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <type name="Magento\Framework\Console\CommandList">
-        <arguments>
-            <argument name="commands" xsi:type="array">
-                <item name="product_url_regeneration_command" xsi:type="object">Iazel\RegenProductUrl\Console\Command\RegenerateProductUrlCommand</item>
-                <item name="category_url_regeneration_command" xsi:type="object">Iazel\RegenProductUrl\Console\Command\RegenerateCategoryUrlCommand</item>
-                <item name="category_path_regeneration_command" xsi:type="object">Iazel\RegenProductUrl\Console\Command\RegenerateCategoryPathCommand</item>
-                <item name="cms_page_url_regeneration_command" xsi:type="object">Iazel\RegenProductUrl\Console\Command\RegenerateCmsPageUrlCommand</item>
-            </argument>
-        </arguments>
-    </type>
-    <preference for="Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator" type="Iazel\RegenProductUrl\Model\CategoryUrlPathGenerator" />
-</config>
diff --git a/Iazel/RegenProductUrl/etc/events.xml b/Iazel/RegenProductUrl/etc/events.xml
deleted file mode 100644
index 284933e..0000000
--- a/Iazel/RegenProductUrl/etc/events.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<!--
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
- */
--->
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
-    <event name="regenerate_category_url_path">
-        <observer name="category_url_path_autogeneration" instance="Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver"/>
-    </event>
-</config>
diff --git a/Iazel/RegenProductUrl/etc/module.xml b/Iazel/RegenProductUrl/etc/module.xml
deleted file mode 100644
index 7c691f1..0000000
--- a/Iazel/RegenProductUrl/etc/module.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0"?>
-<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
-		<module name="Iazel_RegenProductUrl" setup_version="1.0.0"/>
-</config>
diff --git a/Iazel/RegenProductUrl/registration.php b/Iazel/RegenProductUrl/registration.php
deleted file mode 100644
index d11a223..0000000
--- a/Iazel/RegenProductUrl/registration.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-\Magento\Framework\Component\ComponentRegistrar::register(
-    \Magento\Framework\Component\ComponentRegistrar::MODULE,
-    'Iazel_RegenProductUrl',
-    __DIR__
-);
diff --git a/LICENSE b/LICENSE
index 99f4da9..3e8ba6c 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2016 Iazel
+Copyright (c) 2016 Elgentos
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/README.md b/README.md
index c0769f2..440eea4 100644
--- a/README.md
+++ b/README.md
@@ -1,34 +1,39 @@
-# What does it do
+# Elgentos Regenerate Catalog URLs
+
+## What does it do
 This extension adds console commands to be able to regenerate;
 
 - a product rewrite URL based on its url path;
 - a category rewrite URL based on its url path;
+- a CMS page rewrite URL based on its url path;
 - a category URL path based on its URL key and its parent categories.
 
-# Install
+## Install
 Using Composer;
 
 ```sh
 composer require elgentos/regenerate-catalog-urls
-php bin/magento module:enable Iazel_RegenProductUrl
 php bin/magento setup:upgrade
 ```
 
-Or download and copy the `Iazel` directory into `app/code/`, enable the module and run `php bin/magento setup:upgrade`.
+Or download and copy the `src` directory into `app/code/Elgentos/RegenerateCatalogUrls` and run `php bin/magento setup:upgrade`.
 
-# How to use
+## How to use
 ```
 Usage:
  regenerate:product:url [-s|--store="..."] [pids1] ... [pidsN]
- regenerate:category:url [-s]--store="..."] [cids1] ... [cidsN]
- regenerate:category:path [-s]--store="..."] [cids1] ... [cidsN]
+ regenerate:category:url [-s]--store="..."] [-r]--root="..."] [cids1] ... [cidsN]
+ regenerate:category:path [-s]--store="..."] [-r]--root="..."] [cids1] ... [cidsN]
+ regenerate:cms-page:url [-s]--store="..."] [pids1] ... [pidsN]
 
 Arguments:
- pids                  Products to regenerate
+ pids                  Products (or Pages) to regenerate
  cids                  Categories to regenerate
 
 Options:
- --store (-s)          Use the specific Store View (default: 0)
+ --store (-s)          Use a specific store (store Id, store code or 'all')
+ --root (-r)           Regenerate for root category and its children, ignoring cids. 
+ --verbose (-v)        Verbose mode to display the errors. Eg: duplicated product urls
  --help (-h)           Display this help message
 ```
 
@@ -39,4 +44,20 @@ php bin/magento regenerate:product:url
 
 # Regenerate url for products with id (1, 2, 3, 4) for store 1
 php bin/magento regenerate:product:url -s1 1 2 3 4
+
+# Regenerate url for all CMS pages
+php bin/magento regenerate:cms-page:url -s all
+
+# Regenerate url for root category 4 and its children for store 1
+php bin/magento regenerate:category:url -s1 -r4
 ```
+
+## FAQ
+
+### What's the difference between url_key and url_path?
+`url_key` contains the key, like `joust-duffle-bag` for the product "Joust Duffle Bag". The `url_path` is generated by taking the `url_key` and adding the suffix (which for products is stored in `catalog/seo/product_url_suffix` and defaults to `.html`). So the `url_path` would by default become `joust-duffle-bag.html`. It also adds the category slugs of the parent categories so the `url_path` might become `bags/joust-duffle-bag.html`. However, the use of `url_path` has been deprecated since early Magento 2.1 versions (see [here](https://github.com/magento/magento2/issues/9113)). If you are running on a recent Magento 2 version, you can safely delete those values by running `DELETE FROM catalog_product_entity_varchar WHERE attribute_id = (SELECT attribute_id FROM eav_attribute WHERE attribute_code = 'url_path' AND entity_type_id = (SELECT entity_type_id FROM eav_entity_type WHERE entity_type_code = 'catalog_product'))`.
+
+URL paths are still used in categories though, so don't remove those.
+
+### Why am I getting a 'Duplicated url' warning when running the command?
+If you see this error, you have duplicate `url_key` values (within a store) in `catalog_product_entity_varchar`. You can use this extension to check those (and you need to fix them manually): [baldwin/magento2-module-url-data-integrity-checker](https://github.com/baldwin-agency/magento2-module-url-data-integrity-checker).
diff --git a/composer.json b/composer.json
index 4985f1c..c7bcfb7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,26 +1,74 @@
 {
-  "name": "elgentos/regenerate-catalog-urls",
-  "description": "N/A",
-  "require": {
-    "php": "~5.6.0|~7.0|~7.1|~7.2",
-    "magento/framework": ">=100.1",
-    "magento/module-catalog-url-rewrite": ">=100.1",
-    "magento/magento-composer-installer": "*"
-  },
-  "type": "magento2-module",
-  "license": [
-    "OSL-3.0",
-    "AFL-3.0"
-  ],
-  "autoload": {
-    "files": [
-      "Iazel/RegenProductUrl/registration.php"
+    "name": "elgentos/regenerate-catalog-urls",
+    "description": "Regenerate Catalog URL Rewrites (products, categories, cms pages)",
+    "type": "magento2-module",
+    "license": [
+        "OSL-3.0",
+        "AFL-3.0"
     ],
-    "psr-4": {
-      "Iazel\\RegenProductUrl\\": "Iazel/RegenProductUrl"
+    "require": {
+        "php": "~7.4|~8.0|~8.1|~8.2|~8.3",
+        "magento/framework": "^102.0|^103.0",
+        "magento/module-catalog-url-rewrite": "^100.3|^100.4",
+        "magento/module-url-rewrite": "^101.1|^102.0"
+    },
+    "minimum-stability": "stable",
+    "archive": {
+        "exclude": [
+            "/.gitignore",
+            "/grumphp.yml",
+            "/pdepend.xml",
+            "/phpstan.neon",
+            "/phpunit.xml",
+            "/phpcs.xml",
+            "/phpmd.xml",
+            "/package.json",
+            "/.eslintrc.json",
+            "/.eslintignore",
+            "/tests"
+        ]
+    },
+    "replace": {
+        "iazel/module-regen-product-url": "*"
+    },
+    "suggest": {
+        "baldwin/magento2-module-url-data-integrity-checker": "Magento 2 module which can find potential url related problems in your catalog data",
+        "fisheye/module-url-rewrite-optimiser": "A Magento module that stops URL rewrites with category paths being generated for products when 'Use Categories Path for Product URLs' setting is disabled in config."
+    },
+    "require-dev": {
+        "mediact/testing-suite": "^2.9",
+        "mediact/coding-standard-magento2": "@stable"
+    },
+    "repositories": {
+        "magento": {
+            "type": "composer",
+            "url": "https://repo.magento.com/"
+        }
+    },
+    "archive": {
+        "exclude": [
+            "/.gitignore",
+            "/grumphp.yml",
+            "/pdepend.xml",
+            "/phpstan.neon",
+            "/phpunit.xml",
+            "/phpcs.xml",
+            "/phpmd.xml",
+            "/package.json",
+            "/.eslintrc.json",
+            "/.eslintignore",
+            "/tests"
+        ]
+    },
+    "config": {
+        "sort-packages": true
+    },
+    "autoload": {
+        "files": [
+            "src/registration.php"
+        ],
+        "psr-4": {
+            "Elgentos\\RegenerateCatalogUrls\\": "src/"
+        }
     }
-  },
-  "replace": {
-    "iazel/module-regen-product-url": "*"
-  }
 }
diff --git a/grumphp.yml b/grumphp.yml
new file mode 100644
index 0000000..3779b23
--- /dev/null
+++ b/grumphp.yml
@@ -0,0 +1,2 @@
+imports:
+  - resource: 'vendor/mediact/testing-suite/config/default/grumphp.yml'
\ No newline at end of file
diff --git a/package.json b/package.json
new file mode 100644
index 0000000..b76468f
--- /dev/null
+++ b/package.json
@@ -0,0 +1,5 @@
+{
+  "devDependencies": {
+    "eslint": "^4.19.1"
+  }
+}
\ No newline at end of file
diff --git a/pdepend.xml b/pdepend.xml
new file mode 100644
index 0000000..98099fd
--- /dev/null
+++ b/pdepend.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>
+<symfony:container xmlns:symfony="http://symfony.com/schema/dic/services"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xmlns="http://pdepend.org/schema/dic/pdepend"
+    xsi:schemaLocation="http://symfony.com/schema/dic/services http://symfony.com/schema/dic/services/services-1.0.xsd">
+    <config>
+        <cache>
+            <driver>memory</driver>
+        </cache>
+    </config>
+</symfony:container>
diff --git a/phpcs.xml b/phpcs.xml
new file mode 100644
index 0000000..12a9a3c
--- /dev/null
+++ b/phpcs.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ruleset name="PHPCS"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>PHPCS</description>
+    <!--<exclude-pattern>path/to/exclude/*</exclude-pattern>-->
+    <rule ref="./vendor/mediact/coding-standard-magento2/src/MediactMagento2"/>
+</ruleset>
diff --git a/phpmd.xml b/phpmd.xml
new file mode 100644
index 0000000..4852635
--- /dev/null
+++ b/phpmd.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<ruleset name="PHPMD"
+         xmlns="http://pmd.sf.net/ruleset/1.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://pmd.sf.net/ruleset/1.0.0 http://pmd.sf.net/ruleset_xml_schema.xsd"
+         xsi:noNamespaceSchemaLocation="http://pmd.sf.net/ruleset_xml_schema.xsd">
+    <description>PHPMD</description>
+    <!--<exclude-pattern>path/to/exclude/*</exclude-pattern>-->
+    <rule ref="./vendor/mediact/coding-standard-magento2/src/MediactMagento2/phpmd.xml" />
+</ruleset>
diff --git a/phpstan.neon b/phpstan.neon
new file mode 100644
index 0000000..5d19f6e
--- /dev/null
+++ b/phpstan.neon
@@ -0,0 +1,9 @@
+parameters:
+    level: 6
+    paths:
+        - src
+        - tests
+    ignoreErrors:
+        - '#(class|type) Magento\\TestFramework#i'
+        - '#(class|type) Magento\\\S*Factory#i'
+        - '#(method) Magento\\Framework\\Api\\ExtensionAttributesInterface#i'
\ No newline at end of file
diff --git a/phpunit.xml b/phpunit.xml
new file mode 100644
index 0000000..8d7cdbb
--- /dev/null
+++ b/phpunit.xml
@@ -0,0 +1,15 @@
+<phpunit xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:noNamespaceSchemaLocation="vendor/phpunit/phpunit/phpunit.xsd"
+          bootstrap="vendor/autoload.php"
+          cacheResult="false">
+    <testsuites>
+        <testsuite name="default">
+            <directory>tests</directory>
+        </testsuite>
+    </testsuites>
+    <filter>
+        <whitelist processUncoveredFilesFromWhitelist="true">
+            <directory suffix=".php">src</directory>
+        </whitelist>
+    </filter>
+</phpunit>
diff --git a/src/Console/Command/AbstractRegenerateCommand.php b/src/Console/Command/AbstractRegenerateCommand.php
new file mode 100644
index 0000000..8375d8d
--- /dev/null
+++ b/src/Console/Command/AbstractRegenerateCommand.php
@@ -0,0 +1,153 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Console\Command;
+
+use Elgentos\RegenerateCatalogUrls\Service\RegenerateProductUrl;
+use Magento\Framework\App\State;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\StoreManagerInterface;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Question\ChoiceQuestion;
+
+abstract class AbstractRegenerateCommand extends Command
+{
+    /**
+     * @var InputInterface
+     */
+    protected InputInterface $input;
+
+    /**
+     * @var OutputInterface
+     */
+    protected OutputInterface $output;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    protected StoreManagerInterface $storeManager;
+
+    /**
+     * @var State
+     */
+    protected State $state;
+
+    /**
+     * @var RegenerateProductUrl
+     */
+    protected RegenerateProductUrl $regenerateProductUrl;
+
+    /**
+     * @var QuestionHelper
+     */
+    protected QuestionHelper $questionHelper;
+
+    /**
+     * Constructor
+     *
+     * @param StoreManagerInterface $storeManager
+     * @param State $state
+     * @param RegenerateProductUrl $regenerateProductUrl
+     * @param QuestionHelper $questionHelper
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        State $state,
+        RegenerateProductUrl $regenerateProductUrl,
+        QuestionHelper $questionHelper
+    ) {
+        $this->storeManager = $storeManager;
+        $this->state = $state;
+        $this->regenerateProductUrl = $regenerateProductUrl;
+        $this->questionHelper = $questionHelper;
+        parent::__construct();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $this->addOption(
+            'store',
+            's',
+            InputOption::VALUE_OPTIONAL,
+            'Regenerate for a specific store view',
+            false
+        );
+    }
+
+    /**
+     * Get chosen stores
+     *
+     * @return array
+     * @throws LocalizedException
+     */
+    protected function getChosenStores(): array
+    {
+        $storeInput = $this->input->getOption('store');
+
+        if ($this->storeManager->isSingleStoreMode()) {
+            return [1];
+        }
+
+        $storeId = false;
+        if (is_numeric($storeInput)) {
+            $storeId = (int)$storeInput;
+        } elseif ($storeInput === 'all') {
+            $storeId = $storeInput;
+        } elseif (is_string($storeInput)) {
+            $storeId = $this->getStoreIdByCode($storeInput);
+        } elseif (false === $storeInput) {
+            $choices = array_merge(['all'], array_map(fn ($store) => $store->getCode(), $this->getAllStores()));
+            $question = new ChoiceQuestion(__('Pick a store')->getText(), $choices, 'all');
+            $storeCode = $this->questionHelper->ask($this->input, $this->output, $question);
+            $storeId = ($storeCode === 'all' ? 'all' : $this->getStoreIdByCode($storeCode));
+        }
+
+        if ($storeId === 'all') {
+            $stores = array_map(fn ($store) => $store->getId(), $this->getAllStores());
+        } else {
+            $stores = [$storeId];
+        }
+
+        return $stores;
+    }
+
+    /**
+     * Get all stores
+     *
+     * @param bool|null $withDefault
+     * @return array
+     */
+    protected function getAllStores(?bool $withDefault = false): array
+    {
+        return $this->storeManager->getStores($withDefault);
+    }
+
+    /**
+     * Get Store ID by code
+     *
+     * @param string $storeCode
+     * @return null|int
+     * @throws LocalizedException
+     */
+    protected function getStoreIdByCode(string $storeCode): ?int
+    {
+        foreach ($this->getAllStores() as $store) {
+            if ($store->getCode() === $storeCode) {
+                return (int)$store->getId();
+            }
+        }
+
+        throw new LocalizedException(__(
+            'The store that was requested (%1) wasn\'t found. Verify the store and try again.',
+            $storeCode
+        ));
+    }
+}
diff --git a/src/Console/Command/RegenerateCategoryPathCommand.php b/src/Console/Command/RegenerateCategoryPathCommand.php
new file mode 100644
index 0000000..8497379
--- /dev/null
+++ b/src/Console/Command/RegenerateCategoryPathCommand.php
@@ -0,0 +1,147 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Console\Command;
+
+use Elgentos\RegenerateCatalogUrls\Service\RegenerateProductUrl;
+use Magento\Framework\App\Area;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\EntityManager\EventManager;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\App\Emulation;
+use Magento\Store\Model\StoreManagerInterface;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Framework\App\State;
+
+class RegenerateCategoryPathCommand extends AbstractRegenerateCommand
+{
+    /**
+     * @var CategoryCollectionFactory
+     */
+    private CategoryCollectionFactory $categoryCollectionFactory;
+
+    /**
+     * @var EventManager
+     */
+    private EventManager $eventManager;
+
+    /**
+     * @var ?Emulation
+     */
+    private ?Emulation $emulation = null;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param State $state
+     * @param RegenerateProductUrl $regenerateProductUrl
+     * @param QuestionHelper $questionHelper
+     * @param CategoryCollectionFactory $categoryCollectionFactory
+     * @param EventManager $eventManager
+     * @param Emulation $emulation
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        State $state,
+        RegenerateProductUrl $regenerateProductUrl,
+        QuestionHelper $questionHelper,
+        CategoryCollectionFactory $categoryCollectionFactory,
+        EventManager $eventManager,
+        Emulation $emulation
+    ) {
+        parent::__construct($storeManager, $state, $regenerateProductUrl, $questionHelper);
+        $this->categoryCollectionFactory = $categoryCollectionFactory;
+        $this->eventManager = $eventManager;
+        $this->emulation = $emulation;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure(): void
+    {
+        $this->setName('regenerate:category:path')
+            ->setDescription('Regenerate path for given categories')
+            ->addArgument(
+                'cids',
+                InputArgument::IS_ARRAY,
+                'Categories to regenerate'
+            )->addOption(
+                'root',
+                'r',
+                InputOption::VALUE_OPTIONAL,
+                'Regenerate for root category and its children only',
+                false
+            );
+
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        try {
+            $this->state->getAreaCode();
+        } catch (LocalizedException $e) {
+            $this->state->setAreaCode('adminhtml');
+        }
+
+        $stores = $this->getChosenStores();
+
+        foreach ($stores as $storeId) {
+            $categories = $this->categoryCollectionFactory->create()
+                ->setStore($storeId)
+                ->addAttributeToSelect(['name', 'url_path', 'url_key', 'path'])
+                ->addAttributeToFilter('level', ['gt' => 1]);
+
+            $fromRootOnly = (int)$input->getOption('root') ?? 0;
+            $categoryIds = $input->getArgument('cids');
+            if ($fromRootOnly) {
+                //path LIKE '1/rootcategory/%' OR path = '1/rootcategory'
+                $categories->addAttributeToFilter('path', [
+                    'like' => '1/' . $fromRootOnly . '/%',
+                    '=' => '1/' . $fromRootOnly
+                ]);
+            } elseif (!empty($categoryIds)) {
+                $categories->addAttributeToFilter('entity_id', ['in' => $categoryIds]);
+            }
+
+            $counter = 0;
+
+            foreach ($categories as $category) {
+                $output->writeln(
+                    sprintf('Regenerating paths for %s (%s)', $category->getName(), $category->getId())
+                );
+
+                // set url_key in orig data to random value to force regeneration of path
+                $category->setOrigData('url_key', random_int(1, 1000));
+
+                // set url_path in orig data to random value to force regeneration of path for children
+                $category->setOrigData('url_path', random_int(1, 1000));
+
+                // Make use of Magento's event for this
+                $this->emulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
+                $this->eventManager->dispatch('regenerate_category_url_path', ['category' => $category]);
+                $this->emulation->stopEnvironmentEmulation();
+
+                $counter++;
+            }
+
+            $output->writeln(
+                sprintf('Done regenerating. Regenerated url paths for %d categories', $counter)
+            );
+        }
+
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/src/Console/Command/RegenerateCategoryUrlCommand.php b/src/Console/Command/RegenerateCategoryUrlCommand.php
new file mode 100644
index 0000000..8272af8
--- /dev/null
+++ b/src/Console/Command/RegenerateCategoryUrlCommand.php
@@ -0,0 +1,239 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Console\Command;
+
+use Elgentos\RegenerateCatalogUrls\Service\RegenerateProductUrl;
+use Exception;
+use Magento\Framework\App\Area;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\App\Emulation;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Input\InputOption;
+use Symfony\Component\Console\Output\OutputInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Magento\CatalogUrlRewrite\Model\CategoryUrlRewriteGenerator;
+use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
+use Magento\Framework\App\State;
+
+class RegenerateCategoryUrlCommand extends AbstractRegenerateCommand
+{
+    /**
+     * @var CategoryUrlRewriteGenerator
+     */
+    private CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator;
+
+    /**
+     * @var UrlPersistInterface
+     */
+    private UrlPersistInterface $urlPersist;
+
+    /**
+     * @var CategoryCollectionFactory
+     */
+    private CategoryCollectionFactory $categoryCollectionFactory;
+
+    /**
+     * @var ?Emulation
+     */
+    private ?Emulation $emulation = null;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param State $state
+     * @param RegenerateProductUrl $regenerateProductUrl
+     * @param QuestionHelper $questionHelper
+     * @param CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param CategoryCollectionFactory $categoryCollectionFactory
+     * @param Emulation $emulation
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        State $state,
+        RegenerateProductUrl $regenerateProductUrl,
+        QuestionHelper $questionHelper,
+        CategoryUrlRewriteGenerator $categoryUrlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        CategoryCollectionFactory $categoryCollectionFactory,
+        Emulation $emulation
+    ) {
+        parent::__construct($storeManager, $state, $regenerateProductUrl, $questionHelper);
+        $this->categoryUrlRewriteGenerator = $categoryUrlRewriteGenerator;
+        $this->urlPersist = $urlPersist;
+        $this->categoryCollectionFactory = $categoryCollectionFactory;
+        $this->emulation = $emulation;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure(): void
+    {
+        $this->setName('regenerate:category:url')
+            ->setDescription('Regenerate url for given categories')
+            ->addArgument(
+                'cids',
+                InputArgument::IS_ARRAY,
+                'Categories to regenerate'
+            )->addOption(
+                'root',
+                'r',
+                InputOption::VALUE_OPTIONAL,
+                'Regenerate for root category and its children only',
+                false
+            );
+
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        try {
+            $this->state->getAreaCode();
+        } catch (LocalizedException $e) {
+            $this->state->setAreaCode('adminhtml');
+        }
+
+        $counter = 0;
+
+        $stores = $this->getChosenStores();
+
+        $rootIdOption = (int)$input->getOption('root') ?: false;
+
+        foreach ($stores as $storeId) {
+            $currentRootId = $this->storeManager->getGroup(
+                $this->storeManager->getStore($storeId)->getStoreGroupId()
+            )->getRootCategoryId();
+            if ($rootIdOption !== false) {
+                $fromRootId = $rootIdOption;
+                if ($rootIdOption !== $currentRootId) {
+                    $output->writeln(
+                        sprintf(
+                            'Skipping store %s because its root category id %s, differs from the passed root category %s', //phpcs:ignore Generic.Files.LineLength.TooLong
+                            $storeId,
+                            $currentRootId,
+                            $fromRootId
+                        )
+                    );
+                    continue;
+                }
+            } else {
+                $fromRootId = $currentRootId;
+            }
+
+            $output->writeln(
+                sprintf('Processing store %s...', $storeId)
+            );
+
+            $rootCategory = $this->categoryCollectionFactory->create()->addAttributeToFilter(
+                'entity_id',
+                $fromRootId
+            )->addAttributeToSelect("name")->getFirstItem();
+            if (!$rootCategory->getId()) {
+                throw new Exception(sprintf("Root category with ID %d, was not found.", $fromRootId));
+            }
+            $this->emulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
+
+            $categories = $this->categoryCollectionFactory->create()
+                ->setStore($storeId)
+                ->addAttributeToSelect(['name', 'url_path', 'url_key', 'path'])
+                ->addAttributeToFilter('level', ['gt' => 1]);
+
+            $categoryIds = $input->getArgument('cids');
+            if ($fromRootId) {
+                //path LIKE '1/rootcategory/%' OR path = '1/rootcategory'
+                $categories->addAttributeToFilter('path', [
+                    'like' => '1/' . $fromRootId . '/%',
+                    '=' => '1/' . $fromRootId
+                ]);
+            }
+            if (!empty($categoryIds)) {
+                $categories->addAttributeToFilter('entity_id', ['in' => $categoryIds]);
+            }
+
+            foreach ($categories as $category) {
+                $output->writeln(
+                    sprintf(
+                        'Regenerating urls for %s (%s)',
+                        implode('/', [
+                            $rootCategory->getName(),
+                            ...array_map(fn ($category) => $category->getName(), $category->getParentCategories())
+                        ]),
+                        $category->getId()
+                    )
+                );
+
+                $this->urlPersist->deleteByData(
+                    [
+                        UrlRewrite::ENTITY_ID => $category->getId(),
+                        UrlRewrite::ENTITY_TYPE => CategoryUrlRewriteGenerator::ENTITY_TYPE,
+                        UrlRewrite::REDIRECT_TYPE => 0,
+                        UrlRewrite::STORE_ID => $storeId
+                    ]
+                );
+
+                $newUrls = $this->categoryUrlRewriteGenerator->generate($category);
+
+                try {
+                    $newUrls = $this->filterEmptyRequestPaths($newUrls);
+                    $this->urlPersist->replace($newUrls);
+                    $counter += count($newUrls);
+                } catch (Exception $e) {
+                    $output->writeln(
+                        sprintf(
+                            '<error>Duplicated url for store ID %d, category %d (%s) - %s Generated URLs:' .
+                            PHP_EOL . '%s</error>' . PHP_EOL,
+                            $storeId,
+                            $category->getId(),
+                            $category->getName(),
+                            $e->getMessage(),
+                            implode(PHP_EOL, array_keys($newUrls))
+                        )
+                    );
+                }
+            }
+
+            $this->emulation->stopEnvironmentEmulation();
+        }
+        $output->writeln(
+            sprintf('Done regenerating. Regenerated %d urls', $counter)
+        );
+
+        return Cli::RETURN_SUCCESS;
+    }
+
+    /**
+     * Remove entries with request_path='' to prevent error 404 for "http://site.com/" address.
+     *
+     * @param UrlRewrite[] $newUrls
+     *
+     * @return UrlRewrite[]
+     */
+    private function filterEmptyRequestPaths(array $newUrls): array
+    {
+        $result = [];
+
+        foreach ($newUrls as $key => $url) {
+            $requestPath = $url->getRequestPath();
+
+            if (!empty($requestPath)) {
+                $result[$key] = $url;
+            }
+        }
+
+        return $result;
+    }
+}
diff --git a/src/Console/Command/RegenerateCmsPageUrlCommand.php b/src/Console/Command/RegenerateCmsPageUrlCommand.php
new file mode 100644
index 0000000..b37b947
--- /dev/null
+++ b/src/Console/Command/RegenerateCmsPageUrlCommand.php
@@ -0,0 +1,159 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Console\Command;
+
+use Elgentos\RegenerateCatalogUrls\Service\RegenerateProductUrl;
+use Exception;
+use Magento\Cms\Model\Page;
+use Magento\Cms\Model\ResourceModel\Page\CollectionFactory as PageCollectionFactory;
+use Magento\CmsUrlRewrite\Model\CmsPageUrlRewriteGenerator;
+use Magento\Framework\App\Area;
+use Magento\Framework\App\State;
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Store\Model\App\Emulation;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\Exception\UrlAlreadyExistsException;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Symfony\Component\Console\Helper\QuestionHelper;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class RegenerateCmsPageUrlCommand extends AbstractRegenerateCommand
+{
+    /**
+     * @var ?Emulation
+     */
+    private ?Emulation $emulation = null;
+
+    /**
+     * @var PageCollectionFactory
+     */
+    private PageCollectionFactory $pageCollectionFactory;
+
+    /**
+     * @var UrlPersistInterface
+     */
+    private UrlPersistInterface $urlPersist;
+
+    /**
+     * @var CmsPageUrlRewriteGenerator
+     */
+    private CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator;
+
+    /**
+     * @param StoreManagerInterface $storeManager
+     * @param State $state
+     * @param RegenerateProductUrl $regenerateProductUrl
+     * @param QuestionHelper $questionHelper
+     * @param PageCollectionFactory $pageCollectionFactory
+     * @param UrlPersistInterface $urlPersist
+     * @param CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator
+     * @param Emulation $emulation
+     */
+    public function __construct(
+        StoreManagerInterface $storeManager,
+        State $state,
+        RegenerateProductUrl $regenerateProductUrl,
+        QuestionHelper $questionHelper,
+        PageCollectionFactory $pageCollectionFactory,
+        UrlPersistInterface $urlPersist,
+        CmsPageUrlRewriteGenerator $cmsPageUrlRewriteGenerator,
+        Emulation $emulation
+    ) {
+        parent::__construct($storeManager, $state, $regenerateProductUrl, $questionHelper);
+        $this->pageCollectionFactory = $pageCollectionFactory;
+        $this->urlPersist = $urlPersist;
+        $this->cmsPageUrlRewriteGenerator = $cmsPageUrlRewriteGenerator;
+        $this->emulation = $emulation;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function configure()
+    {
+        $this->setName('regenerate:cms-page:url')
+            ->setDescription('Regenerate url for cms pages.')
+            ->addArgument(
+                'pids',
+                InputArgument::IS_ARRAY,
+                'CMS Pages to regenerate'
+            );
+
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        $output->writeln('<info>Start regenerating urls for CMS pages.</info>');
+
+        try {
+            $this->state->getAreaCode();
+        } catch (LocalizedException $e) {
+            $this->state->setAreaCode(Area::AREA_ADMINHTML);
+        }
+
+        $counter = 0;
+
+        $stores = $this->getChosenStores();
+
+        foreach ($stores as $storeId) {
+            $this->emulation->startEnvironmentEmulation($storeId, Area::AREA_FRONTEND, true);
+
+            $pages = $this->pageCollectionFactory->create();
+
+            $pages->addStoreFilter($storeId);
+
+            if (count($input->getArgument('pids')) > 0) {
+                $pageIds = $input->getArgument('pids');
+            } else {
+                $pageIds = $pages->getAllIds();
+            }
+            $pageIds = array_unique($pageIds);
+            $pages->addFieldToFilter('page_id', ['in' => $pageIds]);
+
+            /** @var Page $page */
+            foreach ($pages as $page) {
+                $newUrls = $this->cmsPageUrlRewriteGenerator->generate($page);
+
+                try {
+                    $this->urlPersist->replace($newUrls);
+                    $counter += count($newUrls);
+                } catch (UrlAlreadyExistsException $e) {
+                    $output->writeln(
+                        sprintf(
+                            '<error>Url for page %s (%d) already exists.' . PHP_EOL . '%s</error>',
+                            $page->getTitle(),
+                            $page->getId(),
+                            $e->getMessage()
+                        )
+                    );
+                } catch (Exception $e) {
+                    $output->writeln(
+                        '<error>Couldn\'t replace url for %s (%d)' . PHP_EOL . '%s</error>'
+                    );
+                }
+            }
+
+            $this->emulation->stopEnvironmentEmulation();
+            $output->writeln(
+                sprintf(
+                    '<info>Finished regenerating. Regenerated %d urls.</info>',
+                    $counter
+                )
+            );
+        }
+
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/src/Console/Command/RegenerateProductUrlCommand.php b/src/Console/Command/RegenerateProductUrlCommand.php
new file mode 100644
index 0000000..755b26e
--- /dev/null
+++ b/src/Console/Command/RegenerateProductUrlCommand.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Console\Command;
+
+use Magento\Framework\Console\Cli;
+use Magento\Framework\Exception\LocalizedException;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class RegenerateProductUrlCommand extends AbstractRegenerateCommand
+{
+    /**
+     * @inheritdoc
+     */
+    protected function configure(): void
+    {
+        $this->setName('regenerate:product:url')
+            ->setDescription('Regenerate url for given products')
+            ->addArgument(
+                'pids',
+                InputArgument::IS_ARRAY,
+                'Product IDs to regenerate'
+            );
+
+        parent::configure();
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function execute(InputInterface $input, OutputInterface $output)
+    {
+        $this->input = $input;
+        $this->output = $output;
+
+        try {
+            $this->state->getAreaCode();
+        } catch (LocalizedException $e) {
+            $this->state->setAreaCode('adminhtml');
+        }
+
+        $this->regenerateProductUrl->setOutput($output);
+
+        $stores = $this->getChosenStores();
+
+        foreach ($stores as $storeId) {
+            $this->regenerateProductUrl->execute($input->getArgument('pids'), (int)$storeId, $output->isVerbose());
+        }
+
+        return Cli::RETURN_SUCCESS;
+    }
+}
diff --git a/src/Controller/Adminhtml/Action/Product.php b/src/Controller/Adminhtml/Action/Product.php
new file mode 100644
index 0000000..a0a4d7b
--- /dev/null
+++ b/src/Controller/Adminhtml/Action/Product.php
@@ -0,0 +1,105 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Controller\Adminhtml\Action;
+
+use Exception;
+use Elgentos\RegenerateCatalogUrls\Service\RegenerateProductUrl;
+use Magento\Backend\App\Action;
+use Magento\Backend\App\Action\Context;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\Framework\Controller\Result\Redirect;
+use Magento\Framework\Exception\LocalizedException;
+use Magento\Ui\Component\MassAction\Filter;
+
+class Product extends Action
+{
+    /**
+     * @var RegenerateProductUrl
+     */
+    private RegenerateProductUrl $regenerateProductUrl;
+
+    /**
+     * @var Filter
+     */
+    private Filter $filter;
+
+    /**
+     * @var CollectionFactory
+     */
+    private CollectionFactory $collectionFactory;
+
+    /**
+     * Constructor.
+     *
+     * @param CollectionFactory $collectionFactory
+     * @param Filter $filter
+     * @param RegenerateProductUrl $regenerateProductUrl
+     * @param Context $context
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        Filter $filter,
+        RegenerateProductUrl $regenerateProductUrl,
+        Context $context
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->filter = $filter;
+        $this->regenerateProductUrl = $regenerateProductUrl;
+
+        parent::__construct($context);
+    }
+
+    /**
+     * Execute action based on request and return result
+     *
+     * Note: Request will be added as operation argument in future
+     *
+     * @return Redirect
+     * @throws LocalizedException
+     */
+    public function execute(): Redirect
+    {
+        $productIds = $this->getSelectedProductIds();
+        $storeId = (int)$this->getRequest()->getParam('store', 0);
+        $filters = $this->getRequest()->getParam('filters', []);
+
+        if (isset($filters['store_id'])) {
+            $storeId = (int)$filters['store_id'];
+        }
+
+        try {
+            $this->regenerateProductUrl->execute($productIds, $storeId);
+            $this->messageManager->addSuccessMessage(
+                __(
+                    'Successfully regenerated %1 urls for store id %2.',
+                    $this->regenerateProductUrl->getRegeneratedCount(),
+                    $storeId
+                )
+            );
+        } catch (Exception $e) {
+            $this->messageManager->addExceptionMessage(
+                $e,
+                __('Something went wrong while regenerating the product(s) url.')
+            );
+        }
+
+        $resultRedirect = $this->resultRedirectFactory->create();
+
+        return $resultRedirect->setPath('catalog/product/index');
+    }
+
+    /**
+     * Get selected Product IDs
+     *
+     * @return array
+     * @throws LocalizedException
+     */
+    private function getSelectedProductIds(): array
+    {
+        return $this->filter->getCollection(
+            $this->collectionFactory->create()
+        )->getAllIds();
+    }
+}
diff --git a/src/Model/CategoryUrlPathGenerator.php b/src/Model/CategoryUrlPathGenerator.php
new file mode 100644
index 0000000..e9659ff
--- /dev/null
+++ b/src/Model/CategoryUrlPathGenerator.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Model;
+
+use Magento\Catalog\Model\Category;
+
+class CategoryUrlPathGenerator extends \Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator
+{
+    /**
+     * Determine whether generation url path for parent needed
+     *
+     * @param Category $category
+     *
+     * @return bool
+     */
+    protected function isNeedToGenerateUrlPathForParent($category): bool
+    {
+        /* Force true when command is run from the CLI */
+        if (PHP_SAPI === 'cli') {
+            return true;
+        }
+
+        return $category->isObjectNew() ||
+            $category->getLevel() >= self::MINIMAL_CATEGORY_LEVEL_FOR_PROCESSING;
+    }
+}
diff --git a/src/Service/RegenerateProductUrl.php b/src/Service/RegenerateProductUrl.php
new file mode 100644
index 0000000..c7f2d17
--- /dev/null
+++ b/src/Service/RegenerateProductUrl.php
@@ -0,0 +1,271 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Elgentos\RegenerateCatalogUrls\Service;
+
+use Exception;
+use Magento\Catalog\Model\Product;
+use Magento\Catalog\Model\Product\Attribute\Source\Status;
+use Magento\Catalog\Model\Product\Visibility;
+use Magento\Catalog\Model\ResourceModel\Product\CollectionFactory;
+use Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator;
+use Magento\Framework\Exception\NoSuchEntityException;
+use Magento\Store\Api\Data\StoreInterface;
+use Magento\Store\Model\StoreManagerInterface;
+use Magento\UrlRewrite\Model\UrlPersistInterface;
+use Magento\UrlRewrite\Service\V1\Data\UrlRewrite;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class RegenerateProductUrl
+{
+    /**#@+
+     * Constants
+     */
+    public const BATCH_SIZE = 500;
+    /**#@-*/
+
+    /**
+     * @var OutputInterface|null
+     */
+    private ?OutputInterface $output = null;
+
+    /**
+     * @var CollectionFactory
+     */
+    private CollectionFactory $collectionFactory;
+
+    /**
+     * @var ?ProductUrlRewriteGenerator
+     */
+    private ?ProductUrlRewriteGenerator $urlRewriteGenerator = null;
+
+    /**
+     * @var UrlPersistInterface
+     */
+    private UrlPersistInterface $urlPersist;
+
+    /**
+     * @var StoreManagerInterface
+     */
+    private StoreManagerInterface $storeManager;
+
+    /**
+     * @var int
+     */
+    private int $regeneratedCount = 0;
+
+    /**
+     * @var bool
+     */
+    private bool $isVerboseMode = false;
+
+    /**
+     * Constructor.
+     *
+     * @param CollectionFactory $collectionFactory
+     * @param ProductUrlRewriteGenerator $urlRewriteGenerator
+     * @param UrlPersistInterface $urlPersist
+     * @param StoreManagerInterface $storeManager
+     */
+    public function __construct(
+        CollectionFactory $collectionFactory,
+        ProductUrlRewriteGenerator $urlRewriteGenerator,
+        UrlPersistInterface $urlPersist,
+        StoreManagerInterface $storeManager
+    ) {
+        $this->collectionFactory = $collectionFactory;
+        $this->urlRewriteGenerator = $urlRewriteGenerator;
+        $this->urlPersist = $urlPersist;
+        $this->storeManager = $storeManager;
+    }
+
+    /**
+     * Process
+     *
+     * @param int[]|null $productIds
+     * @param int|null $storeId
+     * @param bool $verbose
+     *
+     * @return void
+     * @throws NoSuchEntityException
+     */
+    public function execute(?array $productIds = null, ?int $storeId = null, bool $verbose = false): void
+    {
+        $this->isVerboseMode = $verbose;
+        $this->regeneratedCount = 0;
+
+        $stores = null !== $storeId
+            ? [$this->storeManager->getStore($storeId)]
+            : $this->storeManager->getStores();
+
+        foreach ($stores as $store) {
+            $regeneratedForStore = 0;
+
+            $this->log(sprintf('Start regenerating for store %s (%d)', $store->getName(), $store->getId()));
+
+            $collection = $this->collectionFactory->create();
+            $collection
+                ->setStoreId($store->getId())
+                ->addStoreFilter($store->getId())
+                ->addAttributeToSelect('name')
+                ->addFieldToFilter('status', ['eq' => Status::STATUS_ENABLED])
+                ->addFieldToFilter('visibility', ['gt' => Visibility::VISIBILITY_NOT_VISIBLE]);
+
+            if ($productIds == null || (is_array($productIds) && empty($productIds))) {
+                $productIds = $collection->getAllIds();
+            }
+            $collection->addIdFilter($productIds);
+
+            $collection->addAttributeToSelect(['url_path', 'url_key']);
+
+            $deleteProducts = [];
+
+            /** @var Product $product */
+            foreach ($collection as $product) {
+                $deleteProducts[] = $product->getId();
+                if (count($deleteProducts) >= self::BATCH_SIZE) {
+                    $this->deleteUrls($deleteProducts, $store);
+                    $deleteProducts = [];
+                }
+            }
+
+            if (count($deleteProducts)) {
+                $this->deleteUrls($deleteProducts, $store, true);
+                $deleteProducts = [];
+            }
+
+            $newUrls = [];
+            /** @var Product $product */
+            foreach ($collection as $product) {
+                if ($this->isVerboseMode) {
+                    $this->log(
+                        sprintf(
+                            'Regenerating urls for %s (%s) in store (%s)',
+                            $product->getSku(),
+                            $product->getId(),
+                            $store->getName()
+                        )
+                    );
+                }
+
+                $product->setStoreId($store->getId());
+
+                //phpcs:ignore Magento2.Performance.ForeachArrayMerge.ForeachArrayMerge
+                $newUrls = array_merge($newUrls, $this->urlRewriteGenerator->generate($product));
+                if (count($newUrls) >= self::BATCH_SIZE) {
+                    $regeneratedForStore += $this->replaceUrls($newUrls);
+                }
+            }
+
+            if (count($newUrls)) {
+                $regeneratedForStore += $this->replaceUrls($newUrls, true);
+            }
+
+            $this->log(
+                sprintf(
+                    'Done regenerating. Regenerated %d urls for store %s (%d)',
+                    $regeneratedForStore,
+                    $store->getName(),
+                    $store->getId()
+                )
+            );
+            $this->regeneratedCount += $regeneratedForStore;
+        }
+    }
+
+    /**
+     * Generate output
+     *
+     * @param OutputInterface $output
+     *
+     * @return void
+     */
+    public function setOutput(OutputInterface $output): void
+    {
+        $this->output = $output;
+    }
+
+    /**
+     * Generate count
+     *
+     * @return int
+     */
+    public function getRegeneratedCount(): int
+    {
+        return $this->regeneratedCount;
+    }
+
+    /**
+     * Log output
+     *
+     * @param string $message
+     *
+     * @return void
+     */
+    private function log(string $message): void
+    {
+        if ($this->output !== null) {
+            $this->output->writeln($message);
+        }
+    }
+
+    /**
+     * Replace urls
+     *
+     * @param array $urls
+     * @param bool $last
+     *
+     * @return int
+     */
+    private function replaceUrls(array &$urls, bool $last = false): int
+    {
+        $this->log(sprintf('replaceUrls%s batch: %d', $last ? ' last' : '', count($urls)));
+
+        if ($this->isVerboseMode) {
+            foreach ($urls as $url) {
+                try {
+                    $this->urlPersist->replace([$url]);
+                } catch (Exception $e) {
+                    $this->log(
+                        sprintf(
+                            $e->getMessage() . ' Entity id: %d Request path: %s',
+                            $url->getEntityId(),
+                            $url->getRequestPath()
+                        )
+                    );
+                }
+            }
+        } else {
+            try {
+                $this->urlPersist->replace($urls);
+            } catch (Exception $e) {//phpcs:ignore Magento2.CodeAnalysis.EmptyBlock.DetectedCatch
+            }
+        }
+
+        $count = count($urls);
+        $urls = [];
+
+        return $count;
+    }
+
+    /**
+     * Remove old product urls
+     *
+     * @param array $productIds
+     * @param StoreInterface $store
+     * @param bool $last
+     *
+     * @return void
+     */
+    private function deleteUrls(array $productIds, StoreInterface $store, bool $last = false): void
+    {
+        $this->log(sprintf('deleteUrls%s batch: %d', $last ? ' last' : '', count($productIds)));
+        $this->urlPersist->deleteByData([
+            UrlRewrite::ENTITY_ID => $productIds,
+            UrlRewrite::ENTITY_TYPE => ProductUrlRewriteGenerator::ENTITY_TYPE,
+            UrlRewrite::REDIRECT_TYPE => 0,
+            UrlRewrite::STORE_ID => $store->getId()
+        ]);
+    }
+}
diff --git a/src/etc/adminhtml/routes.xml b/src/etc/adminhtml/routes.xml
new file mode 100644
index 0000000..dbd13a9
--- /dev/null
+++ b/src/etc/adminhtml/routes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:App/etc/routes.xsd">
+    <router id="admin">
+        <route id="regenerate_urls" frontName="regenerate_url">
+            <module name="Elgentos_RegenerateCatalogUrls"/>
+        </route>
+    </router>
+</config>
diff --git a/src/etc/di.xml b/src/etc/di.xml
new file mode 100644
index 0000000..cfe69e6
--- /dev/null
+++ b/src/etc/di.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
+    <type name="Magento\Framework\Console\CommandListInterface">
+        <arguments>
+            <argument name="commands" xsi:type="array">
+                <item name="product_url_regeneration_command" xsi:type="object">Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateProductUrlCommand</item>
+                <item name="category_url_regeneration_command" xsi:type="object">Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateCategoryUrlCommand</item>
+                <item name="category_path_regeneration_command" xsi:type="object">Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateCategoryPathCommand</item>
+                <item name="cms_page_url_regeneration_command" xsi:type="object">Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateCmsPageUrlCommand</item>
+            </argument>
+        </arguments>
+    </type>
+
+    <type name="Elgentos\RegenerateCatalogUrls\Service\RegenerateProductUrl">
+        <arguments>
+            <argument name="urlRewriteGenerator" xsi:type="object">Magento\CatalogUrlRewrite\Model\ProductUrlRewriteGenerator\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateCategoryPathCommand">
+        <arguments>
+            <argument name="emulation" xsi:type="object">Magento\Store\Model\App\Emulation\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateCategoryUrlCommand">
+        <arguments>
+            <argument name="emulation" xsi:type="object">Magento\Store\Model\App\Emulation\Proxy</argument>
+        </arguments>
+    </type>
+    <type name="Elgentos\RegenerateCatalogUrls\Console\Command\RegenerateCmsPageUrlCommand">
+        <arguments>
+            <argument name="emulation" xsi:type="object">Magento\Store\Model\App\Emulation\Proxy</argument>
+        </arguments>
+    </type>
+
+    <preference for="Magento\CatalogUrlRewrite\Model\CategoryUrlPathGenerator" type="Elgentos\RegenerateCatalogUrls\Model\CategoryUrlPathGenerator" />
+</config>
diff --git a/src/etc/events.xml b/src/etc/events.xml
new file mode 100644
index 0000000..d185c11
--- /dev/null
+++ b/src/etc/events.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Event/etc/events.xsd">
+    <event name="regenerate_category_url_path">
+        <observer name="category_url_path_autogeneration"
+                  instance="Magento\CatalogUrlRewrite\Observer\CategoryUrlPathAutogeneratorObserver"/>
+    </event>
+</config>
diff --git a/src/etc/module.xml b/src/etc/module.xml
new file mode 100644
index 0000000..0aef6c5
--- /dev/null
+++ b/src/etc/module.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Module/etc/module.xsd">
+		<module name="Elgentos_RegenerateCatalogUrls">
+			<sequence>
+				<module name="Magento_Catalog"/>
+				<module name="Magento_CatalogUrlRewrite"/>
+				<module name="Magento_UrlRewrite"/>
+				<module name="Magento_Store"/>
+				<module name="Magento_Cms"/>
+				<module name="Magento_CmsUrlRewrite"/>
+			</sequence>
+		</module>
+</config>
diff --git a/src/i18n/en_US.csv b/src/i18n/en_US.csv
new file mode 100644
index 0000000..554295d
--- /dev/null
+++ b/src/i18n/en_US.csv
@@ -0,0 +1,3 @@
+"Successfully regenerated %1 urls for store id %2.","Successfully regenerated %1 urls for store id %2."
+"Something went wrong while regenerating the product(s) url.","Something went wrong while regenerating the product(s) url."
+"Regenerate Url","Regenerate Url"
diff --git a/src/registration.php b/src/registration.php
new file mode 100644
index 0000000..8448d79
--- /dev/null
+++ b/src/registration.php
@@ -0,0 +1,9 @@
+<?php
+
+use Magento\Framework\Component\ComponentRegistrar;
+
+ComponentRegistrar::register(
+    ComponentRegistrar::MODULE,
+    'Elgentos_RegenerateCatalogUrls',
+    __DIR__
+);
diff --git a/src/view/adminhtml/ui_component/product_listing.xml b/src/view/adminhtml/ui_component/product_listing.xml
new file mode 100644
index 0000000..4af0099
--- /dev/null
+++ b/src/view/adminhtml/ui_component/product_listing.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<listing xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Ui:etc/ui_configuration.xsd">
+    <listingToolbar name="listing_top">
+        <massaction name="listing_massaction"
+                    component="Magento_Ui/js/grid/tree-massactions">
+            <action name="regenerate_url">
+                <settings>
+                    <type>regenerate_url</type>
+                    <label translate="true">Regenerate Url</label>
+                    <url path="regenerate_url/action/product"/>
+                </settings>
+            </action>
+        </massaction>
+    </listingToolbar>
+</listing>