Refactor code structure to improve readability and maintainability, Adds the regulation#41

Richixs merged 7 commits into

mainscesi/cleanup-hack:mainfrom

devscesi/cleanup-hack:devCopy head branch name to clipboard