Refactor code structure for improved readability and maintainability#329

deleonio merged 2 commits intorelease/2public-ui/public-ui.github.io:release/2from

update-deps-v2public-ui/public-ui.github.io:update-deps-v2Copy head branch name to clipboard