Refactor functions' namespaces.
Refactor functions' namespaces.
Merge branch 'refactor' into develop