Categories devided to more specific subcomponents[#82287716]
Merge pull request #56 from BrandyMint/sergey/categories-refactor

Categories devided to more specific subcomponents[#82287716]